[pLog-svn] r5341 - plog/branches/lifetype-1.2/class/action

[jondaley at devel.lifetype.net]

Author: jondaley
Date: 2007-04-24 05:13:01 -0400 (Tue, 24 Apr 2007)
New Revision: 5341

Modified:
   plog/branches/lifetype-1.2/class/action/commentaction.class.php
   plog/branches/lifetype-1.2/class/action/rssaction.class.php
   plog/branches/lifetype-1.2/class/action/searchaction.class.php
   plog/branches/lifetype-1.2/class/action/viewalbumaction.class.php
   plog/branches/lifetype-1.2/class/action/viewresourceaction.class.php
Log:
setCommonData() even when cached (mantis# 1286)

Modified: plog/branches/lifetype-1.2/class/action/commentaction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/action/commentaction.class.php	2007-04-24 09:12:43 UTC (rev 5340)
+++ plog/branches/lifetype-1.2/class/action/commentaction.class.php	2007-04-24 09:13:01 UTC (rev 5341)
@@ -65,8 +65,10 @@
         	$this->_view = new BlogView( $this->_blogInfo, "commentarticle", SMARTY_VIEW_CACHE_CHECK, 
 											   Array( "articleId" => $this->_articleId, "parentId" => $this->_parentId ));
 			// do nothing if the view was already cached
-			if( $this->_view->isCached()) 
+			if( $this->_view->isCached()){
+                $this->setCommonData();
 				return true;
+            }
 
 			// fetch the comments so far
             lt_include( PLOG_CLASS_PATH."class/dao/articlecomments.class.php" );

Modified: plog/branches/lifetype-1.2/class/action/rssaction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/action/rssaction.class.php	2007-04-24 09:12:43 UTC (rev 5340)
+++ plog/branches/lifetype-1.2/class/action/rssaction.class.php	2007-04-24 09:13:01 UTC (rev 5341)
@@ -87,6 +87,7 @@
 			
 			// do nothing if the view was already cached
 			if( $this->_view->isCached()) {
+                $this->setCommonData();
 				return true;
 			}
 			

Modified: plog/branches/lifetype-1.2/class/action/searchaction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/action/searchaction.class.php	2007-04-24 09:12:43 UTC (rev 5340)
+++ plog/branches/lifetype-1.2/class/action/searchaction.class.php	2007-04-24 09:13:01 UTC (rev 5341)
@@ -45,6 +45,7 @@
 			// create the view and make sure that it hasn't been cached
             $this->_view = new BlogTemplatedView( $this->_blogInfo, VIEW_SEARCH_TEMPLATE, Array( "searchTerms" => $this->_searchTerms, "page" => $this->_page ));
 			if( $this->_view->isCached()) {
+                $this->setCommonData();
 				return true;
 			}
 			

Modified: plog/branches/lifetype-1.2/class/action/viewalbumaction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/action/viewalbumaction.class.php	2007-04-24 09:12:43 UTC (rev 5340)
+++ plog/branches/lifetype-1.2/class/action/viewalbumaction.class.php	2007-04-24 09:13:01 UTC (rev 5341)
@@ -63,7 +63,8 @@
 												"page" => $this->_page ));
 			if( $this->_view->isCached()) {
 				// nothing to do if it is cached!
-				return true;
+				$this->setCommonData();
+                return true;
 			}
 			
 			lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresources.class.php" );

Modified: plog/branches/lifetype-1.2/class/action/viewresourceaction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/action/viewresourceaction.class.php	2007-04-24 09:12:43 UTC (rev 5340)
+++ plog/branches/lifetype-1.2/class/action/viewresourceaction.class.php	2007-04-24 09:13:01 UTC (rev 5341)
@@ -77,7 +77,8 @@
 										        "albumId" => $this->_albumId ));
 			// if it's cached, do nothing
 			if( $this->_view->isCached()) {
-				return true;
+				$this->setCommonData();
+                return true;
 			}
 			
 			// otherwise continue as normal...