Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Hotfix #349 #350

Merged
merged 12 commits into from
Aug 12, 2021
1 change: 1 addition & 0 deletions oc-includes/osclass/classes/database/DBConnectionClass.php
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ public function connectToOsclassDb()
'Osclass » Error',
'Osclass database server is not available. <a href="https://osclass.discourse.group/">Need more help?</a></p>'
);
return false;
}

$this->setCharset('utf8', $this->db);
Expand Down
4 changes: 0 additions & 4 deletions oc-includes/osclass/formatting.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@
*/
function add_slashes_extended($array)
{
if (get_magic_quotes_gpc()) {
return $array;
}

foreach ((array) $array as $k => $v) {
if (is_array($v)) {
$array[$k] = add_slashes_extended($v);
Expand Down
4 changes: 0 additions & 4 deletions oc-includes/osclass/install-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,6 @@ function getServerParam($param, $htmlencode = false, $xss_check = true, $quotes_
return htmlspecialchars(stripslashes($value), ENT_NOQUOTES);
}

if (get_magic_quotes_gpc()) {
$value = strip_slashes_extended($value);
}

return ($value);
}

Expand Down
6 changes: 2 additions & 4 deletions oc-includes/osclass/install.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@
define('CONTENT_PATH', ABS_PATH . 'oc-content/');
define('TRANSLATIONS_PATH', CONTENT_PATH . 'languages/');
define('OSC_INSTALLING', 1);

require_once LIB_PATH . 'vendor/autoload.php';

if (extension_loaded('mysqli')) {
require_once LIB_PATH . 'osclass/helpers/hPreference.php';
}
Expand All @@ -49,11 +47,11 @@
require_once LIB_PATH . 'osclass/helpers/hUtils.php';
require_once LIB_PATH . 'osclass/helpers/hTranslations.php';
require_once LIB_PATH . 'osclass/helpers/hSanitize.php';
require_once LIB_PATH . 'osclass/default-constants.php';
require_once LIB_PATH . 'osclass/install-functions.php';
require_once LIB_PATH . 'osclass/utils.php';
require_once LIB_PATH . 'osclass/locales.php';

require_once LIB_PATH . 'osclass/default-constants.php';
define('WEB_PATH', osc_get_absolute_url());
Params::init();
Session::newInstance()->session_start();

Expand Down