[pLog-svn] r3538 - plog/trunk/class/action

[jondaley at devel.lifetype.net]

Author: jondaley
Date: 2006-06-06 01:17:00 +0000 (Tue, 06 Jun 2006)
New Revision: 3538

Modified:
   plog/trunk/class/action/defaultaction.class.php
   plog/trunk/class/action/viewalbumaction.class.php
   plog/trunk/class/action/viewarticleaction.class.php
   plog/trunk/class/action/viewarticletrackbacksaction.class.php
Log:
1.1 has some includes removed, so the 1.0.5 merge caused problems

Modified: plog/trunk/class/action/defaultaction.class.php
===================================================================
--- plog/trunk/class/action/defaultaction.class.php	2006-06-05 23:41:45 UTC (rev 3537)
+++ plog/trunk/class/action/defaultaction.class.php	2006-06-06 01:17:00 UTC (rev 3538)
@@ -4,6 +4,7 @@
 	require_once( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );	
 	include_once( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
 	include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );	
+    include_once( PLOG_CLASS_PATH."class/view/errorview.class.php" );
 
     /**
      * \ingroup Action
@@ -100,7 +101,6 @@
             if( $this->_categoryName ) {
                 $category = $categories->getCategoryByName( $this->_categoryName, $this->_blogInfo->getId());
                 if( !$category ) {
-                    require_once( PLOG_CLASS_PATH."class/view/errorview.class.php" );
                     $this->_view = new ErrorView( $this->_blogInfo );
                     $this->_view->setValue( 'message', "error_incorrect_category_id" );
                     $this->setCommonData();
@@ -115,7 +115,6 @@
 				if( $this->_categoryId > 0 ) {
 					$category = $categories->getCategory( $this->_categoryId, $this->_blogInfo->getId());
 					if( !$category ) {
-                        require_once( PLOG_CLASS_PATH."class/view/errorview.class.php" );
 						$this->_view = new ErrorView( $this->_blogInfo );
 						$this->_view->setValue( 'message', "error_incorrect_category_id" );
 						$this->setCommonData();
@@ -152,7 +151,6 @@
                     // it exists
                 $user = $users->getUserInfoFromUsername( $this->_userName );
                 if( !$user ) {
-                    require_once( PLOG_CLASS_PATH."class/view/errorview.class.php" );
                     $this->_view = new ErrorView( $this->_blogInfo );
                     $this->_view->setValue( 'message', 'error_incorrect_user_username' );
                     $this->setCommonData();
@@ -201,7 +199,6 @@
 
             // if we couldn't fetch the articles, send an error and quit
             if( count($blogArticles) == 0 ) {
-                require_once( PLOG_CLASS_PATH."class/view/errorview.class.php" );
             	$this->_view = new ErrorView( $this->_blogInfo );
                 $this->_view->setValue( 'message', 'error_fetching_articles' );
             }

Modified: plog/trunk/class/action/viewalbumaction.class.php
===================================================================
--- plog/trunk/class/action/viewalbumaction.class.php	2006-06-05 23:41:45 UTC (rev 3537)
+++ plog/trunk/class/action/viewalbumaction.class.php	2006-06-06 01:17:00 UTC (rev 3538)
@@ -4,6 +4,7 @@
 	include_once( PLOG_CLASS_PATH."class/action/blogaction.class.php" );
 	include_once( PLOG_CLASS_PATH."class/view/blogview.class.php" );
     include_once( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
+    include_once( PLOG_CLASS_PATH."class/view/errorview.class.php" );
 
 	define( "VIEW_ALBUMS_TEMPLATE", "albums" );
 	define( "VIEW_ALBUM_TEMPLATE", "album" );
@@ -65,7 +66,6 @@
 				return true;
 			}
 			
-			include_once( PLOG_CLASS_PATH."class/view/errorview.class.php" );
 			include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryresources.class.php" );
 			include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
 			include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );

Modified: plog/trunk/class/action/viewarticleaction.class.php
===================================================================
--- plog/trunk/class/action/viewarticleaction.class.php	2006-06-05 23:41:45 UTC (rev 3537)
+++ plog/trunk/class/action/viewarticleaction.class.php	2006-06-06 01:17:00 UTC (rev 3538)
@@ -3,6 +3,7 @@
 	include_once( PLOG_CLASS_PATH."class/action/blogaction.class.php" );
 	include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
 	include_once( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );	
+    include_once( PLOG_CLASS_PATH."class/view/errorview.class.php" );
 
     /**
      * \ingroup Action

Modified: plog/trunk/class/action/viewarticletrackbacksaction.class.php
===================================================================
--- plog/trunk/class/action/viewarticletrackbacksaction.class.php	2006-06-05 23:41:45 UTC (rev 3537)
+++ plog/trunk/class/action/viewarticletrackbacksaction.class.php	2006-06-06 01:17:00 UTC (rev 3538)
@@ -2,6 +2,7 @@
 
 	include_once( PLOG_CLASS_PATH."class/action/blogaction.class.php" );
 	include_once( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
+    include_once( PLOG_CLASS_PATH."class/view/errorview.class.php" );
 
 	define( "VIEW_TRACKBACKS_TEMPLATE", "posttrackbacks" );
 
@@ -78,7 +79,6 @@
 			 
     		include_once( PLOG_CLASS_PATH."class/dao/articles.class.php" );
     		include_once( PLOG_CLASS_PATH."class/dao/trackbacks.class.php" );
-    		include_once( PLOG_CLASS_PATH."class/view/errorview.class.php" );
 			include_once( PLOG_CLASS_PATH."class/dao/users.class.php" );
 			include_once( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );