[pLog-svn] r2421 - in plog/branches/plog-1.0.2/class: locale net/http

[pwestbro at devel.plogworld.net]

Author: pwestbro
Date: 2005-08-25 16:58:03 +0000 (Thu, 25 Aug 2005)
New Revision: 2421

Modified:
   plog/branches/plog-1.0.2/class/locale/locales.class.php
   plog/branches/plog-1.0.2/class/net/http/httpclient.class.php
Log:
Fixed some more php warnings that occur with PHP5


Modified: plog/branches/plog-1.0.2/class/locale/locales.class.php
===================================================================
--- plog/branches/plog-1.0.2/class/locale/locales.class.php	2005-08-25 10:55:29 UTC (rev 2420)
+++ plog/branches/plog-1.0.2/class/locale/locales.class.php	2005-08-25 16:58:03 UTC (rev 2421)
@@ -84,7 +84,9 @@
                     }
                     
                     // merge the plugin locale with the big locale
-                    $locale->mergeLocale( $pluginLocale );                    
+                    if ( isset( $pluginLocale ) ) {
+                        $locale->mergeLocale( $pluginLocale );                    
+                    }
                 }
                 
                 $loadedLocales[$localeCode] = $locale;

Modified: plog/branches/plog-1.0.2/class/net/http/httpclient.class.php
===================================================================
--- plog/branches/plog-1.0.2/class/net/http/httpclient.class.php	2005-08-25 10:55:29 UTC (rev 2420)
+++ plog/branches/plog-1.0.2/class/net/http/httpclient.class.php	2005-08-25 16:58:03 UTC (rev 2421)
@@ -140,7 +140,7 @@
 					}
 					else
 					{
-						$path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
+						$path = $URI_PARTS["path"].(( array_key_exists( "query", $URI_PARTS ) && $URI_PARTS["query"] ) ? "?".$URI_PARTS["query"] : "");
 						// no proxy, send only the path
 						$this->_httprequest($path, $fp, $URI, $this->_httpmethod);
 					}
@@ -819,6 +819,7 @@
 		}
 
 		//$results = fread($fp, $this->maxlength);
+		$results = "";
 		while(!feof($fp)) {
 			$results .= fgets($fp, 128);
 		}