From 4ed64f8ef83cb5d60005eb1b985adb2e2ea6ff66 Mon Sep 17 00:00:00 2001 From: Jared Hancock <jared@osticket.com> Date: Fri, 8 Feb 2013 22:09:55 -0600 Subject: [PATCH] Don't return disable canned responses --- include/class.canned.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/class.canned.php b/include/class.canned.php index c84950e7d..392a07ec2 100644 --- a/include/class.canned.php +++ b/include/class.canned.php @@ -217,11 +217,13 @@ class Canned { function getCannedResponses($deptId=0, $explicit=false) { - $sql='SELECT canned_id, title FROM '.CANNED_TABLE; + $sql='SELECT canned_id, title FROM '.CANNED_TABLE + .' WHERE isenabled'; if($deptId){ - $sql.=' WHERE dept_id='.db_input($deptId); + $sql.=' AND (dept_id='.db_input($deptId); if(!$explicit) $sql.=' OR dept_id=0'; + $sql.=')'; } $sql.=' ORDER BY title'; -- GitLab