From 301614412ce5c180a7bb90587a88c21ba49543c9 Mon Sep 17 00:00:00 2001 From: Nate Jones Date: Sun, 10 May 2015 04:34:14 +0000 Subject: [PATCH] Menu: Include all groups in list and select. --- core/menu/menu_item_edit.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/core/menu/menu_item_edit.php b/core/menu/menu_item_edit.php index 50c804c589..9fe661f911 100644 --- a/core/menu/menu_item_edit.php +++ b/core/menu/menu_item_edit.php @@ -402,17 +402,12 @@ else { $sql .= " v_groups as g "; $sql .= "where "; $sql .= " mig.group_uuid = g.group_uuid "; - $sql .= " and ("; - $sql .= " g.domain_uuid = :domain_uuid "; - $sql .= " or g.domain_uuid is null "; - $sql .= " ) "; $sql .= " and mig.menu_uuid = :menu_uuid "; $sql .= " and mig.menu_item_uuid = :menu_item_uuid "; $sql .= "order by "; $sql .= " g.domain_uuid desc, "; $sql .= " g.group_name asc "; $prep_statement = $db->prepare(check_sql($sql)); - $prep_statement->bindParam(':domain_uuid', $domain_uuid); $prep_statement->bindParam(':menu_uuid', $menu_uuid); $prep_statement->bindParam(':menu_item_uuid', $menu_item_uuid); $prep_statement->execute(); @@ -441,9 +436,8 @@ else { //group select $sql = "select * from v_groups "; - $sql .= "where (domain_uuid = '".$domain_uuid."' or domain_uuid is null) "; if (sizeof($assigned_groups) > 0) { - $sql .= "and group_uuid not in ('".implode("','",$assigned_groups)."') "; + $sql .= "where group_uuid not in ('".implode("','",$assigned_groups)."') "; } $sql .= "order by domain_uuid desc, group_name asc "; $prep_statement = $db->prepare(check_sql($sql));