Fixed some installer bugs

Geeklog-Core · Jan 10, 2022 · 3ae6ec5 · 3ae6ec5
1 parent 8316486
commit 3ae6ec5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/public_html/admin/install/classes/Install.php b/public_html/admin/install/classes/Install.php
@@ -176,7 +176,7 @@ public function step2($retval, $req_string, $DB, $utf8, $params)
 
     public function step3($retval, $_DB_dbms, $installPlugins, $nextLink, $gl_path)
     {
-        global $_CONF, $_DEVICE, $_URL;
+        global $_CONF, $_DEVICE, $_URL, $_TABLES;
         global $LANG01, $LANG03, $LANG04, $LANG05, $LANG08, $LANG09, $LANG10, $LANG11, $LANG12, $LANG20, $LANG21;
         global $LANG23, $LANG24, $LANG27, $LANG28, $LANG29, $LANG31, $LANG32, $LANG33, $MESSAGE;
 
@@ -192,7 +192,7 @@ public function step3($retval, $_DB_dbms, $installPlugins, $nextLink, $gl_path)
         // We need all this just to do one DB query
         $this->includeConfig(Common::$env['dbconfig_path']);
         require_once Common::$env['siteconfig_path'];
-        $_CONF['path_system'] = Common::$env['gl_path'] . '/system/';
+        $_CONF['path_system'] = Common::$env['gl_path'] . 'system/';
         require_once $_CONF['path_system'] . 'lib-database.php';
 
         if ($_DB_dbms === 'pgsql') {
@@ -294,7 +294,7 @@ public function step3($retval, $_DB_dbms, $installPlugins, $nextLink, $gl_path)
 
                 $this->setVersion(Common::$env['siteconfig_path']);
 
-                if (!$installPlugins) {
+                if ($installPlugins) {
                     // do a default install of all available plugins
 
                     /**

diff --git a/public_html/lib-common.php b/public_html/lib-common.php
@@ -55,13 +55,6 @@
  * lib-custom.php you will find upgrading much easier.
  */
 
-// Prevent PhpStorm from complaining about "undefined variables"
-$_CONF = [];
-$MESSAGE = [];
-$_TABLES = [];
-$_USER = [];
-$LANG_ISO639_1 = 'en';
-
 /**
  * Prevent getting any surprise values. But we should really stop
  * using $_REQUEST altogether.
@@ -72,7 +65,7 @@
  * Configuration Include:
  * You do NOT need to modify anything here any more!
  */
-require_once __DIR__ . '/siteconfig.php';
+require __DIR__ . '/siteconfig.php';
 
 if (COM_isDeveloperMode() &&
     isset($_CONF['developer_mode_php'], $_CONF['developer_mode_php']['error_reporting'])) {