[4630] trunk/htdocs: Updated proxy config check to check for the existence of the server in the StdClass returned by Config ::get().

[svn-N...@habariproject.org]

Revision

4630

Author

lildude

Date

2010-11-27 07:26:36 +0000 (Sat, 27 Nov 2010)

Log Message

Updated proxy config check to check for the existence of the server in the StdClass returned by Config::get(). This fixes the installer, but work still needs to be done on the full proxy implementation via the config.php file

Modified Paths

• trunk/htdocs/system/classes/remoterequest.php

Property Changed

• trunk/htdocs/

Diff

Property changes: trunk/htdocs

Modified: svn:ignore

.project .settings config.php .htaccess tests .geany ._aliencontact.js.php .buildpath + .cache .project .settings config.php .htaccess tests .geany ._aliencontact.js.php .buildpath .config.php.swp

Modified: trunk/htdocs/system/classes/remoterequest.php (4629 => 4630)

--- trunk/htdocs/system/classes/remoterequest.php	2010-11-27 04:04:34 UTC (rev 4629)
+++ trunk/htdocs/system/classes/remoterequest.php	2010-11-27 07:26:36 UTC (rev 4630)
@@ -82,11 +82,9 @@
 		$this->set_timeout( $timeout );
 		
 		// load the proxy configuration, if it exists
-		$proxy = Config::get( 'proxy', null );		// return null if it's not set
-		if ( $proxy != null ) {
-			
+		$proxy = Config::get( 'proxy' );
+		if ( isset( $proxy->server ) ) {
 			$this->set_config( array( 'proxy' => (array)$proxy ) );
-			
 		}
 		
 		// populate the default proxy exceptions list, since we can't up there