Issue #5120 - Prevent warnings.

e107inc · Dec 5, 2023 · 2359d0e · 2359d0e
1 parent 1ad7bc3
commit 2359d0e
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/class2.php b/class2.php
@@ -210,7 +210,17 @@
 
 if(!class_exists('e107_config')) // old e107_config.php format.
 {
-	$e107_paths = compact('ADMIN_DIRECTORY', 'FILES_DIRECTORY', 'IMAGES_DIRECTORY', 'THEMES_DIRECTORY', 'PLUGINS_DIRECTORY', 'HANDLERS_DIRECTORY', 'LANGUAGES_DIRECTORY', 'HELP_DIRECTORY', 'DOWNLOADS_DIRECTORY','UPLOADS_DIRECTORY','SYSTEM_DIRECTORY', 'MEDIA_DIRECTORY','CACHE_DIRECTORY','LOGS_DIRECTORY', 'CORE_DIRECTORY', 'WEB_DIRECTORY');
+	$dirNames = ['ADMIN_DIRECTORY', 'FILES_DIRECTORY', 'IMAGES_DIRECTORY', 'THEMES_DIRECTORY', 'PLUGINS_DIRECTORY', 'HANDLERS_DIRECTORY', 'LANGUAGES_DIRECTORY', 'HELP_DIRECTORY', 'DOWNLOADS_DIRECTORY','UPLOADS_DIRECTORY','SYSTEM_DIRECTORY', 'MEDIA_DIRECTORY','CACHE_DIRECTORY','LOGS_DIRECTORY', 'CORE_DIRECTORY', 'WEB_DIRECTORY'];
+
+	$e107_paths = [];
+	foreach ($dirNames as $name)
+	{
+	    if (isset($$name))
+	    {
+	        $e107_paths[$name] = $$name;
+	    }
+	}
+
 	$legacy_sql_info = compact('mySQLserver', 'mySQLuser', 'mySQLpassword', 'mySQLdefaultdb', 'mySQLprefix');
 	if(isset($mySQLport))
 	{
@@ -228,7 +238,6 @@
 	$e107_paths = $config->paths();
 	$sql_info = $config->database();
 	$E107_CONFIG = $config->other() ?? [];
-	//unset($config);
 }