sync with PEAR 1.3.6

4 files changed, 12 insertions, 8 deletions

diff --git a/pear/PEAR/Command/Package.php b/pear/PEAR/Command/Package.php
index 13f0c920f8..0923a51775 100644
--- a/pear/PEAR/Command/Package.php
+++ b/pear/PEAR/Command/Package.php
@@ -15,6 +15,7 @@
 // +----------------------------------------------------------------------+
 // | Authors: Stig Bakken <ssb@php.net>                                   |
 // |          Martin Jansen <mj@php.net>                                  |
+// |          Greg Beaver <cellog@php.net>                                |
 // +----------------------------------------------------------------------+
 //
 // $Id$
diff --git a/pear/PEAR/ErrorStack.php b/pear/PEAR/ErrorStack.php
index d1dcf9233e..9ad94d738c 100644
--- a/pear/PEAR/ErrorStack.php
+++ b/pear/PEAR/ErrorStack.php
@@ -538,6 +538,10 @@ class PEAR_ErrorStack {
                 'message' => $msg,
                );
 
+        if ($repackage) {
+            $err['repackage'] = $repackage;
+        }
+
         // set up the error message, if necessary
         if ($this->_msgCallback) {
             $msg = call_user_func_array($this->_msgCallback,
@@ -545,9 +549,6 @@ class PEAR_ErrorStack {
             $err['message'] = $msg;
         }        
         
-        if ($repackage) {
-            $err['repackage'] = $repackage;
-        }
         $push = $log = true;
         $die = false;
         // try the overriding callback first
@@ -909,8 +910,10 @@ class PEAR_ErrorStack {
         } else {
             $mainmsg = $stack->getErrorMessageTemplate($err['code']);
         }
+
         $mainmsg = str_replace('%__msg%', $err['message'], $mainmsg);
-        if (count($err['params'])) {
+
+        if (count($err['params']) && count($err['params'])) {
             foreach ($err['params'] as $name => $val) {
                 if (is_array($val)) {
                     // @ is needed in case $val is a multi-dimensional array
@@ -978,4 +981,4 @@ class PEAR_ErrorStack {
 }
 $stack = &PEAR_ErrorStack::singleton('PEAR_ErrorStack');
 $stack->pushCallback(array('PEAR_ErrorStack', '_handleError'));
-?>
\ No newline at end of file
+?>
diff --git a/pear/PEAR/Remote.php b/pear/PEAR/Remote.php
index a42750af7c..555ec63b6c 100644
--- a/pear/PEAR/Remote.php
+++ b/pear/PEAR/Remote.php
@@ -115,8 +115,8 @@ class PEAR_Remote extends PEAR
                 $this->saveCache($_args, $result);
             };
             return $result;
-        } else {
-            return $this->raiseError("For this remote PEAR operation you need to load the xmlrpc extension or install XML_RPC");
+        } elseif (!@include_once("XML/RPC.php")) {
+            return $this->raiseError("For this remote PEAR operation you need to install the XML_RPC package");
         }
 
         array_shift($args);
diff --git a/pear/package-PEAR.xml b/pear/package-PEAR.xml
index 301233e850..9a134fdd4c 100644
--- a/pear/package-PEAR.xml
+++ b/pear/package-PEAR.xml
@@ -49,7 +49,7 @@
   </maintainers>
   <release>
     <version>1.3.6</version>
-    <date>2005-08-17</date>
+    <date>2005-08-18</date>
     <state>stable</state>
     <license>PHP License</license>
     <notes>