maj.world

commit c9ae728483994b6c17c78466117331aa63812c6e
tree cffbb2a1b75da1083c5623d409cca7cddf054ae6
parent c370cb89311ba2ba44b2e7a632eb7effe2881fdb
author Engels Antonio <engels@majcms.org> 1326237779 +0800
committer Engels Antonio <engels@majcms.org> 1326237779 +0800

    Change $maj_uquery value determination

diff --git a/core.php b/core.php
index b7a5c4b..a5055a2 100644
--- a/core.php
+++ b/core.php
@@ -117,7 +117,7 @@ $maj_aimage = $maj_ablock - $maj_wspace;
 
 $maj_eimage = $maj_wentry - $maj_wspace - $maj_ablock;
 
-$maj_uquery = count($_REQUEST) - count($_COOKIE);
+$maj_uquery = count($_GET);
 
 if (file_exists("$maj_data_directory/panels-l.txt") or file_exists("$maj_data_directory/panels-r.txt")) {
 
diff --git a/index.php b/index.php
index 5385b9e..42ca206 100644
--- a/index.php
+++ b/index.php
@@ -953,7 +953,7 @@ if (file_exists("$maj_data_directory/panels")) {
                                        continue;
                                }
 
-                               if (file_exists("$maj_data_directory/panels/$maj_panel/noquery.txt") and ($maj_uquery >= 0) and (!isset($maj_logged_in_username) or ($maj_logged_in_username != $maj_admin_username))) {
+                               if (file_exists("$maj_data_directory/panels/$maj_panel/noquery.txt") and ($maj_uquery > 0) and (!isset($maj_logged_in_username) or ($maj_logged_in_username != $maj_admin_username))) {
                                        continue;
                                }
 
@@ -1051,7 +1051,7 @@ echo "\r\n\r\n<td valign=\"top\" width=\"$maj_wentry\">\r\n\r\n";
 
 maj_panels($maj_top_panels);
 
-if (file_exists("$maj_data_directory/bb.txt") and file_exists("$maj_data_directory/bb-summary.txt") and !file_exists("$maj_data_directory/lite.txt") and ($maj_uquery < 0)) {
+if (file_exists("$maj_data_directory/bb.txt") and file_exists("$maj_data_directory/bb-summary.txt") and !file_exists("$maj_data_directory/lite.txt") and ($maj_uquery == 0)) {
 
        if ($maj_count_latest > 0) {