From e25f5494bbd2f1da7cf41fb0072b9284115946f0 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sat, 23 Jul 2016 00:27:48 -0600 Subject: [PATCH] Update phrases.php Show for global phrases. --- app/phrases/phrases.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/phrases/phrases.php b/app/phrases/phrases.php index 13da732c5a..0c7c3de49c 100644 --- a/app/phrases/phrases.php +++ b/app/phrases/phrases.php @@ -61,8 +61,11 @@ require_once "resources/check_auth.php"; echo ""; echo "
\n"; - $sql = "select * from v_phrases "; - $sql .= "where domain_uuid = '".$domain_uuid."' "; + $sql = "select count(*) as num_rows from v_phrases "; + $sql .= "where ( "; + $sql .= " domain_uuid = '".$domain_uuid."' "; + $sql .= " or domain_uuid is null "; + $sql .= ") "; $prep_statement = $db->prepare(check_sql($sql)); $prep_statement->execute(); $result = $prep_statement->fetchAll(PDO::FETCH_NAMED); @@ -77,7 +80,10 @@ require_once "resources/check_auth.php"; $offset = $rows_per_page * $page; $sql = "select * from v_phrases "; - $sql .= "where domain_uuid = '$domain_uuid' "; + $sql .= "where ( "; + $sql .= " domain_uuid = '".$domain_uuid."' "; + $sql .= " or domain_uuid is null "; + $sql .= ") "; $sql .= "order by ".((strlen($order_by) > 0) ? $order_by." ".$order." " : "phrase_name asc "); $sql .= "limit ".$rows_per_page." offset ".$offset." "; $prep_statement = $db->prepare(check_sql($sql)); @@ -151,4 +157,4 @@ require_once "resources/check_auth.php"; //include the footer require_once "resources/footer.php"; -?> \ No newline at end of file +?>