From f36ab6ae1503ee54a7c9d0083a8089286d8b37ef Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 22 Dec 2008 17:03:14 +0000 Subject: [PATCH] Fix for non-working admin login if no extension is installed (an other fixed broke it) --- inc/databases.php | 2 +- inc/functions.php | 5 +++++ inc/mysql-manager.php | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/inc/databases.php b/inc/databases.php index f2be6b0f0a..a1eb89f4d1 100644 --- 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 e255045bb0..5c0715d6bb 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -929,6 +929,11 @@ function LOAD_URL($URL, $addUrlData=true) { } // Get output buffer + /* + print "
";
+	debug_print_backtrace();
+	die("
"); + */ $OUTPUT = ob_get_contents(); // Clear it only if there is content diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 504e0ebb11..4f2c89ca68 100644 --- 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"); } -- 2.39.5