Merge remote-tracking branch 'origin/3.3' into develop
Conflicts: htdocs/install/inc.php
This commit is contained in:
commit
0beea6c23c
@ -231,7 +231,6 @@ foreach ($handlers as $handler)
|
|||||||
if (empty($conf->loghandlers[$handler])) $conf->loghandlers[$handler]=$loghandlerinstance;
|
if (empty($conf->loghandlers[$handler])) $conf->loghandlers[$handler]=$loghandlerinstance;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Removed magic_quotes
|
// Removed magic_quotes
|
||||||
if (function_exists('get_magic_quotes_gpc')) // magic_quotes_* removed in PHP 5.4
|
if (function_exists('get_magic_quotes_gpc')) // magic_quotes_* removed in PHP 5.4
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user