Fixes for header.php if database connection is lost

diff --git a/inc/databases.php b/inc/databases.php
index 900e938e2bcf65ba5425f75bde1ce213d29e4e57..60045547c15e253e7e57ff09cab3a7a8ec877546 100644 (file)
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -114,7 +114,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // This current patch level
-define('CURR_SVN_REVISION', "297");
+define('CURR_SVN_REVISION', "298");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);

diff --git a/inc/header.php b/inc/header.php
index cbb11da08d791b7b3fb2cd9f49e43502d50d6537..ce152eaad04333294e4453eb6674f5563558365b 100644 (file)
--- a/inc/header.php
+++ b/inc/header.php
@@ -50,8 +50,10 @@ if (($header != "1") && ($header != "2")) {
 
                // Add title decorations? (left)
                if (!defined('__PAGE_TITLE')) {
-                       if ((count($_CONFIG) > 1) && (is_resource($link)) && (isset($db))) {
-                               if (($_CONFIG['enable_title_deco'] == "Y") && (trim(!empty($_CONFIG['title_left'])))) $TITLE .= trim($_CONFIG['title_left'])." ";
+                       // Config and database connection valid?
+                       if ((isset($_CONFIG)) && (is_array($_CONFIG)) && (count($_CONFIG) > 1) && (is_resource($link)) && (isset($db))) {
+                               // Title decoration enabled?
+                               if (($_CONFIG['enable_title_deco'] == "Y") && (!empty($_CONFIG['title_left']))) $TITLE .= trim($_CONFIG['title_left'])." ";
                                $TITLE .= MAIN_TITLE;
 
                                // Add title of module? (middle decoration will also be added!)
@@ -84,7 +86,7 @@ if (($header != "1") && ($header != "2")) {
                                define('__PAGE_TITLE', NO_CONFIG_FOUND_TITLE);
 
                                // Do not add the fatal message in installation mode
-                               if (basename($_SERVER['SELF']) != "install.php") ADD_FATAL(NO_CONFIG_FOUND);
+                               if (basename($_SERVER['PHP_SELF']) != "install.php") ADD_FATAL(NO_CONFIG_FOUND);
                        }
                }