Fix for non-working admin login if no extension is installed (an other fixed broke it)

diff --git a/inc/databases.php b/inc/databases.php
index f2be6b0f0aeba452135018abfda2bb272c644a3a..a1eb89f4d174ee426102b79e583ba204eee9c621 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('CURR_SVN_REVISION', "698");
+define('CURR_SVN_REVISION', "699");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);

diff --git a/inc/functions.php b/inc/functions.php
index e255045bb0f459f463401a1a8cc05877383636b2..5c0715d6bb94e06704c683e33f737315b66c4f31 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -929,6 +929,11 @@ function LOAD_URL($URL, $addUrlData=true) {
        }
 
        // Get output buffer
+       /*
+       print "<pre>";
+       debug_print_backtrace();
+       die("</pre>");
+       */
        $OUTPUT = ob_get_contents();
 
        // Clear it only if there is content

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 504e0ebb11d4f4e3de64293675cbbf1e0546f3fb..4f2c89ca681ed7aa7032b0e7fa4fcceafeb02a6e 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -912,7 +912,7 @@ function GET_ACTION ($MODE, &$wht) {
 
                // Free memory
                SQL_FREERESULT($result);
-       } elseif (GET_EXT_VERSION("sql_patches") == "") {
+       } elseif ((GET_EXT_VERSION("sql_patches") == "") && ($MODE != "admin")) {
                // No sql_patches installed!
                LOAD_URL("admin.php");
        }