[pLog-svn] r3426 - in plog/trunk/class: dao net/http summary/action template/templatesets

oscar at devel.lifetype.net oscar at devel.lifetype.net
Tue May 16 22:23:11 GMT 2006


Author: oscar
Date: 2006-05-16 22:23:11 +0000 (Tue, 16 May 2006)
New Revision: 3426

Modified:
   plog/trunk/class/dao/blogs.class.php
   plog/trunk/class/net/http/subdomains.class.php
   plog/trunk/class/summary/action/summarydefaultaction.class.php
   plog/trunk/class/template/templatesets/templatesets.class.php
Log:
moved a few includes


Modified: plog/trunk/class/dao/blogs.class.php
===================================================================
--- plog/trunk/class/dao/blogs.class.php	2006-05-16 22:17:51 UTC (rev 3425)
+++ plog/trunk/class/dao/blogs.class.php	2006-05-16 22:23:11 UTC (rev 3426)
@@ -5,7 +5,7 @@
 	include_once( PLOG_CLASS_PATH."class/dao/daocacheconstants.properties.php" );
     
     define( "ALL_BLOG_CATEGORIES", 0 );   
-
+    
     /**
      * \ingroup DAO
      * DAO class for BlogInfo objects, which represent a blog.

Modified: plog/trunk/class/net/http/subdomains.class.php
===================================================================
--- plog/trunk/class/net/http/subdomains.class.php	2006-05-16 22:17:51 UTC (rev 3425)
+++ plog/trunk/class/net/http/subdomains.class.php	2006-05-16 22:23:11 UTC (rev 3426)
@@ -1,7 +1,5 @@
 <?php
 
-	
-	include_once( PLOG_CLASS_PATH."class/net/linkparser.class.php" );	
 	include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
 	include_once( PLOG_CLASS_PATH."class/net/url.class.php" );
 	
@@ -22,6 +20,7 @@
 		 */
 		function getSubdomainInfoFromRequest()
 		{
+        	include_once( PLOG_CLASS_PATH."class/net/linkparser.class.php" );			
 			$config =& Config::getConfig();
 			$url = new Url( $config->getValue( "subdomains_base_url"));
 			$lp =  new LinkParser( $url->getHost());

Modified: plog/trunk/class/summary/action/summarydefaultaction.class.php
===================================================================
--- plog/trunk/class/summary/action/summarydefaultaction.class.php	2006-05-16 22:17:51 UTC (rev 3425)
+++ plog/trunk/class/summary/action/summarydefaultaction.class.php	2006-05-16 22:23:11 UTC (rev 3426)
@@ -21,8 +21,6 @@
          */
         function perform()
         {
-            include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
-
             // get the blogCategoryId from request
 			$globalArticleCategoryId = $this->_request->getValue( "globalArticleCategoryId" );
 			$val = new IntegerValidator();
@@ -37,6 +35,7 @@
 				return true;
 			}
 
+            include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
             include_once( PLOG_CLASS_PATH."class/dao/globalarticlecategories.class.php" );
             include_once( PLOG_CLASS_PATH."class/summary/dao/summarystats.class.php" );
             $blogs       = new Blogs();

Modified: plog/trunk/class/template/templatesets/templatesets.class.php
===================================================================
--- plog/trunk/class/template/templatesets/templatesets.class.php	2006-05-16 22:17:51 UTC (rev 3425)
+++ plog/trunk/class/template/templatesets/templatesets.class.php	2006-05-16 22:23:11 UTC (rev 3426)
@@ -4,7 +4,6 @@
 	include_once( PLOG_CLASS_PATH."class/template/templatesets/templateset.class.php" );
 	include_once( PLOG_CLASS_PATH."class/template/templatesets/templatesetstorage.class.php" );
 	include_once( PLOG_CLASS_PATH."class/template/templateservice.class.php" );
-	include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
 
 	/**
 	 * \ingroup Template
@@ -102,6 +101,7 @@
          */
         function getBlogTemplates( $blogId )
         {
+        	include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );        
         	$blogs = new Blogs();
             $blogInfo = $blogs->getBlogInfo( $blogId );
             $blogSettings = $blogInfo->getSettings();
@@ -183,6 +183,7 @@
          */
         function isBlogTemplate( $templateName, $blogId )
         {
+        	include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );        
         	$blogs = new Blogs();
         	$blog = $blogs->getBlogInfo( $blogId );
             $blogSettings = $blog->getSettings( $blogId );



More information about the pLog-svn mailing list