[pLog-svn] r1715 - plog/branches/plog-1.1-ben/class/view

[ork at devel.plogworld.net]

Author: ork
Date: 2005-04-04 20:09:03 +0000 (Mon, 04 Apr 2005)
New Revision: 1715

Modified:
   plog/branches/plog-1.1-ben/class/view/blogview.class.php
Log:
again includes reorganized.. 


Modified: plog/branches/plog-1.1-ben/class/view/blogview.class.php
===================================================================
--- plog/branches/plog-1.1-ben/class/view/blogview.class.php	2005-04-04 19:54:48 UTC (rev 1714)
+++ plog/branches/plog-1.1-ben/class/view/blogview.class.php	2005-04-04 20:09:03 UTC (rev 1715)
@@ -1,16 +1,9 @@
 <?php
 
 	include_once( PLOG_CLASS_PATH.'class/view/smartyview.class.php' );
-    include_once( PLOG_CLASS_PATH.'class/dao/bloginfo.class.php' );
-    include_once( PLOG_CLASS_PATH.'class/data/plogcalendar.class.php' );
-    include_once( PLOG_CLASS_PATH.'class/dao/articles.class.php' );
-	include_once( PLOG_CLASS_PATH.'class/dao/archivelink.class.php' );
-    include_once( PLOG_CLASS_PATH.'class/dao/articles.class.php' );
-    include_once( PLOG_CLASS_PATH.'class/dao/mylinks.class.php' );
-    include_once( PLOG_CLASS_PATH.'class/misc/version.class.php' );
-    include_once( PLOG_CLASS_PATH.'class/dao/mylinkscategories.class.php' ); 
+//    include_once( PLOG_CLASS_PATH.'class/dao/bloginfo.class.php' );
+//    include_once( PLOG_CLASS_PATH.'class/dao/mylinks.class.php' );
     include_once( PLOG_CLASS_PATH.'class/plugin/pluginmanager.class.php' );
-    include_once( PLOG_CLASS_PATH.'class/xml/rssparser/rssparser.class.php' );    
 
     /**
      * \ingroup View
@@ -29,6 +22,8 @@
 		 */
 		function BlogView( $blogInfo, $template, $cachingEnabled = SMARTY_VIEW_CACHE_CHECK, $data = Array())
         {
+            include_once( PLOG_CLASS_PATH.'class/dao/articles.class.php' );
+
 			// the SmartyView will generate the right Template object for us
         	$this->SmartyView( $blogInfo, $template, $cachingEnabled, $data );
 			
@@ -51,6 +46,8 @@
          */
         function generateCalendar( $year = null, $month = null )
         {
+            include_once( PLOG_CLASS_PATH.'class/data/plogcalendar.class.php' );
+
 			$monthPosts = $this->getValue( 'monthposts' );
             $locale     = $this->_blogInfo->getLocale();
 
@@ -79,6 +76,7 @@
          */
         function _getArchives()
         { 
+	        include_once( PLOG_CLASS_PATH.'class/dao/archivelink.class.php' );
             include_once( PLOG_CLASS_PATH.'class/data/timestamp.class.php' );
 
             $archiveStats = $this->articles->getNumberPostsPerMonth( $this->_blogInfo->getId());
@@ -151,6 +149,8 @@
          */
         function _getLinkCategories()
         {
+            include_once( PLOG_CLASS_PATH.'class/dao/mylinkscategories.class.php' ); 
+
 			$blogSettings = $this->_blogInfo->getSettings();
 			$linkCategoriesOrder = $blogSettings->getValue( 'link_categories_order', MYLINKS_CATEGORIES_NO_ORDER );		
             $myLinksCategories = new MyLinksCategories();
@@ -184,7 +184,12 @@
 		 */
 		function render()
 		{		
+            include_once( PLOG_CLASS_PATH.'class/misc/version.class.php' );
+            include_once( PLOG_CLASS_PATH.'class/xml/rssparser/rssparser.class.php' );    
+
 			if( !$this->isCached()) {
+                include_once( PLOG_CLASS_PATH.'class/data/plogcalendar.class.php' );
+
 				// and then add our stuff to the view...
 				$this->setValue( 'archives', $this->_getArchives());
 				$this->setValue( 'recentposts', $this->_getRecentPosts());