Merge pull request e107inc#3037 from Deltik/fix-3033

Fixes: e107inc#3033 Defers setting the SITEURL constant and dependencies until MySQL is connected
kreativmind · Feb 13, 2018 · be062da · be062da
2 parents de7fb1d + d1a69b0
commit be062da
Show file tree

Hide file tree

Showing 3 changed files with 186 additions and 173 deletions.
diff --git a/class2.php b/class2.php
@@ -464,6 +464,10 @@ function genericAutoload($className)
 /* PHP Compatabilty should *always* be on. */
 e107_require_once(e_HANDLER.'php_compatibility_handler.php');
 
+// SITEURL constant depends on the database
+// See https://github.com/e107inc/e107/issues/3033 for details.
+$e107->set_urls_deferred();
+
 //
 // L: Extract core prefs from the database
 //
@@ -2841,4 +2845,4 @@ function plugInstalled($plugname)
 	return isset($pref['plug_installed'][$plugname]);*/
 }
 
-$sql->db_Mark_Time('(After class2)');
+$sql->db_Mark_Time('(After class2)');