Merge branch 'sharedList_deletion' into '7.4.0'

Logger migration error resolved

See merge request !812

include/logging.php

@@ -24,18 +24,8 @@ require_once('config.php');
 global $PERFORMANCE_CONFIG;
 
 define('LOG4PHP_DEFAULT_INIT_OVERRIDE', true);
+define('LOG4PHP_DIR', 'libraries/log4php.debug');
+require_once(LOG4PHP_DIR.'/Logger.php');
+Logger::configure('log4php.properties');
 
-if(isset($PERFORMANCE_CONFIG) && isset($PERFORMANCE_CONFIG['LOG4PHP_DEBUG']) && $PERFORMANCE_CONFIG['LOG4PHP_DEBUG']) {
-	define('LOG4PHP_DIR', 'libraries/log4php.debug');
-        require_once(LOG4PHP_DIR.'/Logger.php');
-        Logger::configure('log4php.properties');
-} else {
-	define('LOG4PHP_DIR', 'libraries/log4php');
-        require_once(LOG4PHP_DIR.'/Logger.php');
-        require_once(LOG4PHP_DIR.'/LoggerPropertyConfigurator.php');
-
-        $config = new LoggerPropertyConfigurator();
-        $config->configure('log4php.properties');
-}
-// END
 ?>
\ No newline at end of file