[pLog-svn] r6008 - in plog/branches/lifetype-1.2/class: action dao

[jondaley at devel.lifetype.net]

Author: jondaley
Date: 2007-10-23 10:31:33 -0400 (Tue, 23 Oct 2007)
New Revision: 6008

Modified:
   plog/branches/lifetype-1.2/class/action/defaultaction.class.php
   plog/branches/lifetype-1.2/class/dao/article.class.php
Log:
this->_categories isn't always set prior to calling getCategory()

Modified: plog/branches/lifetype-1.2/class/action/defaultaction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/action/defaultaction.class.php	2007-10-23 11:19:57 UTC (rev 6007)
+++ plog/branches/lifetype-1.2/class/action/defaultaction.class.php	2007-10-23 14:31:33 UTC (rev 6008)
@@ -169,7 +169,7 @@
 				$user = null;
 			}	
 
-			if( ($blogSettings->getValue( 'show_future_posts_in_calendar')) && ( $this->_date > -1 )) {
+			if($blogSettings->getValue( 'show_future_posts_in_calendar')){
 				// if posts in the future are to be shown, we shouldn't set a maximum date
 				$todayTimestamp = 0;
 			}

Modified: plog/branches/lifetype-1.2/class/dao/article.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/dao/article.class.php	2007-10-23 11:19:57 UTC (rev 6007)
+++ plog/branches/lifetype-1.2/class/dao/article.class.php	2007-10-23 14:31:33 UTC (rev 6008)
@@ -252,7 +252,8 @@
 		 */
 		function getCategory()
 		{
-			return $this->_categories[0];
+            $categories = $this->getCategories();
+			return $categories[0];
 		}
 
         /**