[4631] trunk/htdocs/system/classes/remoterequest.php: Partial proxy configuration supplied via config. php should now work without errors

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

Revision

4631

Author

lildude

Date

2010-11-27 07:56:57 +0000 (Sat, 27 Nov 2010)

Log Message

Partial proxy configuration supplied via config.php should now work without errors

Modified Paths

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

Diff

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

--- trunk/htdocs/system/classes/remoterequest.php	2010-11-27 07:26:36 UTC (rev 4630)
+++ trunk/htdocs/system/classes/remoterequest.php	2010-11-27 07:56:57 UTC (rev 4631)
@@ -86,7 +86,7 @@
 		if ( isset( $proxy->server ) ) {
 			$this->set_config( array( 'proxy' => (array)$proxy ) );
 		}
-		
+
 		// populate the default proxy exceptions list, since we can't up there
 		$this->config['proxy']['exceptions'] = array_merge( $this->config['proxy']['exceptions'], array(
 			'localhost',
@@ -139,9 +139,15 @@
                 $this->set_config( $name, $value );
             }
 
-        } else {
-        	$this->config[ $config ] = $value;
         }
+		else {
+			if ( is_array( $value ) ) {
+				$this->config[ $config ] = array_merge( $this->config[ $config ], $value );
+			}
+			else {
+				$this->config[ $config ] = $value;
+			}
+        }
     }
 	
 	/**