Several rewrites/fixes which I have done yesterday but not commited, mxchange_die...

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

diff --git a/inc/modules/admin/what-memedit.php b/inc/modules/admin/what-memedit.php
index e657f36cde207caefd3882d763e6c5838237fa47..72c27ee5f85c694fc3e01542f81483e805258c17 100644 (file)
--- a/inc/modules/admin/what-memedit.php
+++ b/inc/modules/admin/what-memedit.php
@@ -49,7 +49,7 @@ ADD_DESCR("admin", __FILE__);
 $AND = "(`what` = '' OR `what` IS NULL)"; $SUB = "";
 
 if (REQUEST_ISSET_GET(('sub'))) {
-       $AND = sprintf("action='%s' AND `what` IS NOT NULL", REQUEST_GET(('sub')));
+       $AND = sprintf("`action`='%s' AND `what` IS NOT NULL", REQUEST_GET(('sub')));
        $SUB = REQUEST_GET(('sub'));
 }
 
@@ -183,7 +183,7 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO())) {
        foreach (REQUEST_POST('sel') as $sel => $menu) {
                $AND = "(`what` = '' OR `what` IS NULL)";
                $sel = bigintval($sel);
-               if (!empty($SUB)) $AND = "action='".$SUB."'";
+               if (!empty($SUB)) $AND = "`action`='".$SUB."'";
                switch (REQUEST_POST('ok'))
                {
                case "edit": // Edit menu
@@ -224,10 +224,10 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO())) {
                        SQL_FREERESULT($result);
                } else {
                        // Main menu selected
-                       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE (what='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
                         array(bigintval(REQUEST_GET('tid'))), __FILE__, __LINE__);
                        list($tid) = SQL_FETCHROW($result);
-                       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE (what='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
                         array(bigintval(REQUEST_GET('fid'))), __FILE__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                }
@@ -246,7 +246,7 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO())) {
                $result = SQL_QUERY("SELECT id, action, what, title, sort FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE ".$AND." AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort` ASC", __FILE__, __LINE__);
        } else {
                // Edit main menus
-               $result = SQL_QUERY("SELECT id, action, what, title, sort FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE (what='' OR `what` IS NULL) ORDER BY `sort` ASC", __FILE__, __LINE__);
+               $result = SQL_QUERY("SELECT id, action, what, title, sort FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort` ASC", __FILE__, __LINE__);
        }
 
        $max = SQL_NUMROWS($result);