// Check if action/what pair is valid
$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_admin_menu
-WHERE action='%s' AND ((what='%s' AND what != 'overview') OR (what='' AND '%s'='overview'))
+WHERE action='%s' AND ((what='%s' AND what != 'overview') OR ((what='' OR what IS NULL) AND '%s'='overview'))
LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__);
if (SQL_NUMROWS($result) == 1)
{
$menuTitle = array();
// Build main menu
- $result_main = SQL_QUERY("SELECT action, title, descr FROM "._MYSQL_PREFIX."_admin_menu WHERE what='' ORDER BY sort, id DESC", __FILE__, __LINE__);
+ $result_main = SQL_QUERY("SELECT action, title, descr FROM "._MYSQL_PREFIX."_admin_menu WHERE (what='' OR what IS NULL) ORDER BY sort, id DESC", __FILE__, __LINE__);
$OUT = "";
if (SQL_NUMROWS($result_main) > 0)
{
//
function ADMIN_MENU_SELECTION($MODE, $default="", $defid="") {
$wht = "what != ''";
- if ($MODE == "action") $wht = "what='' AND action !='login'";
+ if ($MODE == "action") $wht = "(what='' OR what IS NULL) AND action !='login'";
$result = SQL_QUERY_ESC("SELECT %s, title FROM "._MYSQL_PREFIX."_admin_menu WHERE ".$wht." ORDER BY sort",
array($MODE), __FILE__, __LINE__);
if (SQL_NUMROWS($result) > 0)