Fixes missing variable CSS in installation phase. Resolved #15

diff --git a/inc/databases.php b/inc/databases.php
index 50d4e691e9982ae77525b179f3517b36badd17c3..ae4d2bc0f0df460611c3b9f929118199f03eae78 100644 (file)
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -115,7 +115,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // Current SVN revision
 define('SERVER_URL', "http://www.mxchange.org");
 
 // Current SVN revision

-define('CURR_SVN_REVISION', "693");
+define('CURR_SVN_REVISION', "694");

 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index efe013a2784a79446800c94fe1d44809ae078720..f9f1457e4d078eefb271a0140d232a654c654a18 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -44,7 +44,7 @@ define('DEBUG_SQL', false);
 require_once(PATH."inc/db/lib.php");
 
 // Non-database functions
 require_once(PATH."inc/db/lib.php");
 
 // Non-database functions

-require_once(PATH."inc/functions.php");  
+require_once(PATH."inc/functions.php");

 
 // Filter functions
 require_once(PATH."inc/filters.php");  
 
 // Filter functions
 require_once(PATH."inc/filters.php");  


@@ -257,6 +257,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
        ///////////////////////////////////////////////////
 
        // Set other missing variables
        ///////////////////////////////////////////////////
 
        // Set other missing variables

+       if (!isset($CSS)) $CSS = "0";

        $link = false; // No database link by default
 
        // Include required files
        $link = false; // No database link by default
 
        // Include required files


@@ -264,8 +265,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
        require_once(PATH."inc/session.php");
 
        // Check if we are in installation routine
        require_once(PATH."inc/session.php");
 
        // Check if we are in installation routine

-       $installPhp = basename($_SERVER['PHP_SELF']);
-       if (($installPhp != "install.php") && ($CSS != "1") && ($CSS != -1)) {
+       if ((basename($_SERVER['PHP_SELF']) != "install.php") && ($CSS != "1") && ($CSS != -1)) {

                // Redirect to the installation system
                LOAD_URL("install.php");
        } // END - if
                // Redirect to the installation system
                LOAD_URL("install.php");
        } // END - if