aboutsummaryrefslogtreecommitdiff
path: root/h-source/Application/Controllers
diff options
context:
space:
mode:
authorAntonio Gallo <tonicucoz@gmail.com>2010-10-21 17:11:25 +0000
committerAntonio Gallo <tonicucoz@gmail.com>2010-10-21 17:11:25 +0000
commit7d5c4370ef18072c936cde31b095f207056bc06b (patch)
tree8c97bae28126f6dafe2e3f5506e611a65dbf0caf /h-source/Application/Controllers
parent2c3856df1196c92db2cf7e76f8d523f9bdd44177 (diff)
no public notice is left where a message is deleted by a moderator
Diffstat (limited to 'h-source/Application/Controllers')
-rw-r--r--h-source/Application/Controllers/GenericController.php2
-rw-r--r--h-source/Application/Controllers/IssuesController.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/h-source/Application/Controllers/GenericController.php b/h-source/Application/Controllers/GenericController.php
index a08956e..1b9e64a 100644
--- a/h-source/Application/Controllers/GenericController.php
+++ b/h-source/Application/Controllers/GenericController.php
@@ -361,7 +361,7 @@ class GenericController extends BaseController
if (count($data['table']) > 0)
{
- $data['talk_number'] = $this->m['TalkModel']->select('count(*) as numb,id_hard')->where(array('id_hard'=>$clean['id_hard']))->rowNumber();
+ $data['talk_number'] = $this->m['TalkModel']->select('count(*) as numb,id_hard')->where(array('id_hard'=>$clean['id_hard'],'deleted'=>'no'))->rowNumber();
$data['ne_name'] = $data['table'][0]['hardware']['model'];
$data['name'] = encodeUrl($data['ne_name']);
diff --git a/h-source/Application/Controllers/IssuesController.php b/h-source/Application/Controllers/IssuesController.php
index 02f6499..80a9486 100644
--- a/h-source/Application/Controllers/IssuesController.php
+++ b/h-source/Application/Controllers/IssuesController.php
@@ -90,7 +90,7 @@ class IssuesController extends BaseController
//load the Pages helper
$this->helper('Pages',$this->controller.'/viewall/'.$this->lang,'page');
//get the number of records
- $this->m['IssuesModel']->from('issues left join messages')->using('id_issue')->aWhere(array('deleted'=>'no'))->groupBy('issues.id_issue');
+ $this->m['IssuesModel']->from('issues left join messages')->using('id_issue')->aWhere(array('deleted'=>'no','-deleted'=>'no'))->groupBy('issues.id_issue');
$recordNumber = $this->m['IssuesModel']->rowNumber();
$page = $this->viewArgs['page'];