More fixes for points booking and surfbar

[mailer.git] / inc / modules / admin / what-repair_amnu.php

diff --git a/inc/modules/admin/what-repair_amnu.php b/inc/modules/admin/what-repair_amnu.php
index a9b1844ca1f20ae35bdc09486705da476efd43c2..774d53e80088f71c952589171f097f23ad51abf2 100644 (file)
--- a/inc/modules/admin/what-repair_amnu.php
+++ b/inc/modules/admin/what-repair_amnu.php
@@ -43,7 +43,7 @@ ADD_DESCR("admin", basename(__FILE__));
 global $link;
 $ACTIONs = array();
 // First fix all main menus (what="")...
-$result_fix = SQL_QUERY("SELECT id, action FROM "._MYSQL_PREFIX."_admin_menu WHERE what='' AND action != 'logout' ORDER BY sort ASC", __FILE__, __LINE__);
+$result_fix = SQL_QUERY("SELECT id, action FROM "._MYSQL_PREFIX."_admin_menu WHERE (what='' OR what IS NULL) AND action != 'logout' ORDER BY sort ASC", __FILE__, __LINE__);
 $cnt = 0; $REP = 0;
 while(list($id, $act) = SQL_FETCHROW($result_fix))
 {
@@ -51,7 +51,7 @@ while(list($id, $act) = SQL_FETCHROW($result_fix))
        $ACTIONs[] = $act;
 
        // Fix weight
-       $result_sort = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admin_menu SET sort='%s' WHERE id=%d LIMIT 1",
+       $result_sort = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admin_menu SET sort='%s' WHERE id=%s LIMIT 1",
         array($cnt, bigintval($id)), __FILE__, __LINE__);
        $REP += SQL_AFFECTEDROWS();
 
@@ -63,7 +63,7 @@ while(list($id, $act) = SQL_FETCHROW($result_fix))
 SQL_FREERESULT($result_fix);
 
 // Set logout weight to 999
-$result_sort = SQL_QUERY("UPDATE "._MYSQL_PREFIX."_admin_menu SET sort='999' WHERE action='logout' AND what='' LIMIT 1", __FILE__, __LINE__);
+$result_sort = SQL_QUERY("UPDATE "._MYSQL_PREFIX."_admin_menu SET sort='999' WHERE action='logout' AND (what='' OR what IS NULL) LIMIT 1", __FILE__, __LINE__);
 
 // Now sort every each menu
 foreach ($ACTIONs as $act)
@@ -74,7 +74,7 @@ foreach ($ACTIONs as $act)
        while (list($id) = SQL_FETCHROW($result_fix))
        {
                // Fix weight
-               $result_sort = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admin_menu SET sort='%s' WHERE id=%d LIMIT 1",
+               $result_sort = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admin_menu SET sort='%s' WHERE id=%s LIMIT 1",
                 array($cnt, bigintval($id)), __FILE__, __LINE__);
                $REP += SQL_AFFECTEDROWS();