Browse Source

Conditional includes if the config.php exists this fixes css.php for the install.

markjcrane 9 years ago
parent
commit
c7670bed76
1 changed files with 7 additions and 5 deletions
  1. 7 5
      resources/require.php

+ 7 - 5
resources/require.php

@@ -29,15 +29,15 @@
 
 
 //find and include the config.php file
 //find and include the config.php file
 	if (file_exists("/etc/fusionpbx/config.php")) {
 	if (file_exists("/etc/fusionpbx/config.php")) {
+		$config_exists = true;
 		include "/etc/fusionpbx/config.php";
 		include "/etc/fusionpbx/config.php";
 	}
 	}
 	elseif (file_exists("/usr/local/etc/fusionpbx/config.php")) {
 	elseif (file_exists("/usr/local/etc/fusionpbx/config.php")) {
+		$config_exists = true;
 		include "/usr/local/etc/fusionpbx/config.php";
 		include "/usr/local/etc/fusionpbx/config.php";
 	}
 	}
 	elseif (file_exists("resources/config.php")) {
 	elseif (file_exists("resources/config.php")) {
-		include "resources/config.php";
-	}
-	else {
+		$config_exists = true;
 		include "resources/config.php";
 		include "resources/config.php";
 	}
 	}
 
 
@@ -71,9 +71,11 @@
 
 
 //additional includes
 //additional includes
 	require_once "resources/php.php";
 	require_once "resources/php.php";
-	require "resources/pdo.php";
 	require_once "resources/functions.php";
 	require_once "resources/functions.php";
-	require_once "resources/switch.php";
+	if ($config_exists) {
+		require "resources/pdo.php";
+		require_once "resources/switch.php";
+	}
 
 
 //change language on the fly - for translate tool (if available)
 //change language on the fly - for translate tool (if available)
 	if (isset($_REQUEST['view_lang_code']) && ($_REQUEST['view_lang_code']) != '') {
 	if (isset($_REQUEST['view_lang_code']) && ($_REQUEST['view_lang_code']) != '') {