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

jondaley at devel.lifetype.net jondaley at devel.lifetype.net
Tue May 7 15:08:45 EDT 2013


Author: jondaley
Date: 2013-05-07 15:08:45 -0400 (Tue, 07 May 2013)
New Revision: 7208

Modified:
   plog/branches/lifetype-1.2/class/action/admin/adminaction.class.php
Log:
remove return by references to avoid PHP errors

Modified: plog/branches/lifetype-1.2/class/action/admin/adminaction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/action/admin/adminaction.class.php	2013-04-25 13:31:59 UTC (rev 7207)
+++ plog/branches/lifetype-1.2/class/action/admin/adminaction.class.php	2013-05-07 19:08:45 UTC (rev 7208)
@@ -62,7 +62,7 @@
             $session = HttpVars::getSession();
             $this->_session = $session["SessionInfo"];
 
-            $this->_config  =& Config::getConfig();
+            $this->_config  = Config::getConfig();
 
             // get the information about the user and quit if we don't have it...
             $this->_getUserInfo();
@@ -85,12 +85,12 @@
             }
 			
 			// prepare the plugin manager in case we'd like to throw events
-			$this->_pm =& PluginManager::getPluginManager();			
+			$this->_pm = PluginManager::getPluginManager();			
 			
 			// fetch the site locale
-            $this->_locale =& $this->getLocale();
+            $this->_locale = $this->getLocale();
 
-			$users =& new Users();
+			$users = new Users();
             $this->_userBlogs = $users->getUsersBlogs( $this->_userInfo->getId(), BLOG_STATUS_ACTIVE );            
 			// in case we're in "admin mode" (where administrators can log into anybody's blog), we should also
 			// display the current blog in the drop-down list on the top left corner, if only to make it clear to
@@ -172,11 +172,10 @@
         	// don't like this so much...
         	if( !empty( $this->_blogInfo ) ) {
         		$this->_blogSettings = $this->_blogInfo->getSettings();
-            	//$locale =& LTLocales::getLocale( $this->_blogSettings->getValue("locale"));
-				$locale =& $this->_blogInfo->getLocale();
+				$locale = $this->_blogInfo->getLocale();
             }
             else {
-            	$locale =& LTLocales::getLocale( $this->_config->getValue("default_locale"));
+            	$locale = LTLocales::getLocale( $this->_config->getValue("default_locale"));
             }
 			
 			return $locale;
@@ -233,7 +232,7 @@
         function mustAuthenticatePage()
         {
 			$locale = $this->getLocale();		
-			$config =& Config::getConfig();			
+			$config = Config::getConfig();			
 			$destinationUrl = $config->getValue( "logout_destination_url", "" );
             if( $destinationUrl == "" ) {
 				$view = new AdminDefaultView();



More information about the pLog-svn mailing list