Changeset 2094 in ExiteCMS

Timestamp:

12/06/08 22:42:30 (3 years ago)

Author:

WanWizard

Message:

fixed some PHP notice errors
moved the check on PHP debugging mode up, so it gets processed asap

Location:

trunk/includes

Files:

• core_functions.php (modified) (4 diffs)
• db_functions.php (modified) (1 diff)

trunk/includes/core_functions.php

@@ -56 +56 @@
 }
 
+// store the magic quotes setting
+define("QUOTES_GPC", (ini_get('magic_quotes_gpc') ? TRUE : FALSE));
+
+// Browser window dimensions (assume 1024x768 if no cookies found)
+define("BROWSER_WIDTH", isset($_COOKIE['width']) ? $_COOKIE['width'] : 1024);
+define("BROWSER_HEIGHT", isset($_COOKIE['height']) ? $_COOKIE['height'] : 768);
+
 // disable the standard PHP include path (empty's not accepted?)
 ini_set('include_path', '.');
@@ -109 +116 @@
 while ($data = dbarray($result)) {
     $settings[$data['cfg_name']] = $data['cfg_value'];
+}
+
+// activate PHP error reporting
+if (isset($settings['debug_php_errors']) && $settings['debug_php_errors']) {
+    error_reporting(E_ALL);
 }
 
@@ -173 +185 @@
     define("USER_IP", '0.0.0.0');
 }
-// store the magic quotes setting
-define("QUOTES_GPC", (ini_get('magic_quotes_gpc') ? TRUE : FALSE));
-
-// Browser window dimensions (assume 1024x768 if no cookies found)
-define("BROWSER_WIDTH", isset($_COOKIE['width']) ? $_COOKIE['width'] : 1024);
-define("BROWSER_HEIGHT", isset($_COOKIE['height']) ? $_COOKIE['height'] : 768);
 
 // load the user functions
@@ -185 +191 @@
 // set the query log debugging switch, enable error reporting if needed
 $_db_log = checkgroup($settings['debug_querylog'], false);
-
-// activate PHP error reporting
-if (isset($settings['debug_php_errors']) && $settings['debug_php_errors']) {
-    error_reporting(E_ALL);
-}
 
 // load the locale functions

trunk/includes/db_functions.php

@@ -101 +101 @@
 
     // bail out if an error occurred and we're NOT in CLI mode!
-    if (!CMS_CLI && !$result) {
+    if ((defined('CMS_CLI') && !CMS_CLI) && !$result) {
         if ($display || $settings['debug_querylog']) {
             echo "<pre><br />Query: ".$query."<br />";