From 6c9438fc97569c3dbab20700007b8b48382a09f7 Mon Sep 17 00:00:00 2001
From: Jared Hancock <gravydish@gmail.com>
Date: Sat, 21 Jul 2012 16:27:20 -0500
Subject: [PATCH] Keep number of associated filters in canned reply info
---
include/class.canned.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/class.canned.php b/include/class.canned.php
index 202f9eeeb..8ba175ba1 100644
--- a/include/class.canned.php
+++ b/include/class.canned.php
@@ -32,7 +32,7 @@ class Canned {
return false;
$sql='SELECT canned.*, count(attach.file_id) as attachments, '
- .' (count(filter.id) > 0) as in_use '
+ .' count(filter.id) as filters '
.' FROM '.CANNED_TABLE.' canned '
.' LEFT JOIN '.CANNED_ATTACHMENT_TABLE.' attach ON (attach.canned_id=canned.canned_id) '
.' LEFT JOIN '.EMAIL_FILTER_TABLE.' filter ON (canned.canned_id = filter.canned_response_id) '
@@ -64,8 +64,8 @@ class Canned {
return $this->isEnabled();
}
- function isInUse() {
- return $this->ht['in_use'];
+ function getNumFilters() {
+ return $this->ht['filters'];
}
function getTitle() {
@@ -187,7 +187,7 @@ class Canned {
}
function delete(){
- if ($this->isInUse()) return false;
+ if ($this->getNumFilters() > 0) return false;
$sql='DELETE FROM '.CANNED_TABLE.' WHERE canned_id='.db_input($this->getId()).' LIMIT 1';
if(db_query($sql) && ($num=db_affected_rows())) {
--
GitLab