From 5019b5e2e4b55c67dd89b670dc0aa39e8b5f7f90 Mon Sep 17 00:00:00 2001
From: Greg Beaver <cellog@php.net>
Date: Mon, 22 Aug 2005 22:17:30 +0000
Subject: [PATCH] sync with PEAR 1.3.6

---
 pear/PEAR/ErrorStack.php | 13 ++++++++-----
 pear/PEAR/Remote.php     |  4 ++--
 pear/go-pear-list.php    |  2 +-
 pear/package-PEAR.xml    | 24 +++++++++++++-----------
 4 files changed, 24 insertions(+), 19 deletions(-)

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 c75b11b5c1..555ec63b6c 100644
--- a/pear/PEAR/Remote.php
+++ b/pear/PEAR/Remote.php
@@ -115,10 +115,10 @@ class PEAR_Remote extends PEAR
                 $this->saveCache($_args, $result);
             };
             return $result;
-        }
-        if (!@include_once("XML/RPC.php")) {
+        } 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);
         $server_host = $this->config->get('master_server');
         $username = $this->config->get('username');
diff --git a/pear/go-pear-list.php b/pear/go-pear-list.php
index 49635f1097..3085306cce 100755
--- a/pear/go-pear-list.php
+++ b/pear/go-pear-list.php
@@ -7,7 +7,7 @@
  */
 $packages  = array(
 // required packages for the installer
-"PEAR"                  =>    "1.3.5",
+"PEAR"                  =>    "1.3.6",
 "XML_RPC"               =>    "1.4.0",
 "Console_Getopt"        =>    "1.2",
 "Archive_Tar"           =>    "1.3.1",
diff --git a/pear/package-PEAR.xml b/pear/package-PEAR.xml
index 190f680097..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>
@@ -126,9 +126,21 @@
       <dep type="pkg" rel="ge" version="1.4.0">XML_RPC</dep>
       <dep type="ext" rel="has">xml</dep>
       <dep type="ext" rel="has">pcre</dep>
+      <dep type="ext" rel="has" optional="yes">xmlrpc</dep>
     </deps>
   </release>
   <changelog>
+  <release>
+    <version>1.3.5</version>
+    <date>2005-02-18</date>
+    <state>stable</state>
+    <license>PHP License</license>
+    <notes>
+ * fix Bug #3505: pecl can't install PDO
+ * enhance pear run-tests dramatically
+ * fix Bug #3506: pear install should export the pear version into the environment
+    </notes>
+  </release>
   <release>
     <version>1.3.1</version>
     <date>2004-04-06</date>
@@ -196,15 +208,5 @@ Other:
  * make pear help listing more useful (put how-to-use info at the bottom of the listing)
     </notes>
    </release>
-  <release>
-    <version>1.3.5</version>
-    <date>2005-02-18</date>
-    <state>stable</state>
-    <notes>
- * fix Bug #3505: pecl can't install PDO
- * enhance pear run-tests dramatically
- * fix Bug #3506: pear install should export the pear version into the environment
-    </notes>
-   </release>
   </changelog>
 </package>
-- 
2.50.1