Excluded deleted Questions from All views

fosils · May 17, 2011 · 90b4468 · 90b4468
1 parent 801f923
commit 90b4468
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 26 deletions.
diff --git a/lib/Lampcms/Controllers/Tagged.php b/lib/Lampcms/Controllers/Tagged.php
@@ -56,8 +56,8 @@
 /**
  * Controller for rendering page
  * with list of questions for specific tag or tags
- * 
- * 
+ *
+ *
  * @author Dmitri Snytkine
  *
  */
@@ -78,18 +78,18 @@ class Tagged extends Unanswered
 	 * Conditions can be == 'unanswered', 'hot', 'recent' (default)
 	 */
 	protected function getCursor(){
-		
+
 		/**
 		 * Must call getTags() before
 		 * using this->rawTags because
 		 * it is set inside the getTags() method
-		 * 
-		 * 
+		 *
+		 *
 		 */
 		$this->aTags = $this->getTags();
 		$this->pagerPath = '/tagged/'.$this->rawTags;
 
-		
+
 		d('aTags: '.print_r($this->aTags, 1));
 
 		$aFields = array();
@@ -105,14 +105,8 @@ protected function getCursor(){
 		$sort = array('i_ts' => -1);
 
 		$where = array('a_tags' => array('$all' => $this->aTags) );
+		$where['i_del_ts'] = null;
 
-		/**
-		 * Exclude deleted items unless viewer
-		 * is a moderator
-		 */
-		if(!$this->oRegistry->Viewer->isModerator()){
-			$where['i_del_ts'] = null;
-		}
 
 		/**
 		 * @todo
@@ -131,8 +125,8 @@ protected function getCursor(){
 		return $this;
 	}
 
-	
-	
+
+
 	protected function makeRecentTags(){
 
 		/**
@@ -174,7 +168,7 @@ protected function makeRecentTags(){
 		}
 
 		$this->makeFollowTagButton();
-		
+
 		return $this;
 	}
 

diff --git a/lib/Lampcms/Controllers/Unanswered.php b/lib/Lampcms/Controllers/Unanswered.php
@@ -90,7 +90,7 @@ class Unanswered extends Viewquestions
 	 * @var string
 	 */
 	protected $tags = '';
-	
+
 	/**
 	 * Tags
 	 */
@@ -141,7 +141,7 @@ protected function getCursor(){
 			case 'tagged':
 				$where = array('i_sel_ans' => null, 'a_tags' => array('$all' => $this->getTags()) );
 				$this->pagerPath = '/unanswered/tagged/'.$this->rawTags;
-				 //'i_sel_ans' => null,
+				//'i_sel_ans' => null,
 				$this->typeDiv = Urhere::factory($this->oRegistry)->get('tplQuntypes', 'newest');
 				/**
 				 * @todo
@@ -165,12 +165,10 @@ protected function getCursor(){
 		}
 
 		/**
-		 * Exclude deleted items unless viewer
-		 * is a moderator
+		 * Exclude deleted items
 		 */
-		if(!$this->oRegistry->Viewer->isModerator()){
-			$where['i_del_ts'] = null;
-		}
+		$where['i_del_ts'] = null;
+
 		$this->oCursor = $this->oRegistry->Mongo->QUESTIONS->find($where);
 		$this->count = $this->oCursor->count(true);
 		d('$this->oCursor: '.gettype($this->oCursor).' $this->count: '.$this->count);
@@ -202,7 +200,7 @@ protected function addTagFollowers(){
 	 */
 	protected function getTags(){
 		if(empty($this->aTags)){
-				
+
 			/**
 			 * And now a workaround
 			 * for the genocidal RewriteRule bug
@@ -252,12 +250,12 @@ protected function getTags(){
 			$this->rawTags = $tags;
 			$this->title = $this->tags;
 			d('this->title: '.$this->title);
-
+				
 			if(empty($this->tags)){
 				return array();
 			}
 
-
+				
 			$this->aTags = explode(' ', $this->tags);
 			$this->aTags = \array_filter($this->aTags);
 			d('aTags: '.print_r($this->aTags, 1));