clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 09:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync with PEAR 1.3.6

Browse Source
This commit is contained in:
Greg Beaver 2005-08-22 22:09:54 +00:00
parent de247c88cd
commit ae8a3a0f9e
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pear/PEAR/Command/Package.php
View File

@ -15,6 +15,7 @@
// +----------------------------------------------------------------------+
// | Authors: Stig Bakken <ssb@php.net> |
// | Martin Jansen <mj@php.net> |
// | Greg Beaver <cellog@php.net> |
// +----------------------------------------------------------------------+
//
// $Id$

13
pear/PEAR/ErrorStack.php
View File

@ -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'));
?>
?>

4
pear/PEAR/Remote.php
View File

@ -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);

2
pear/package-PEAR.xml
View File

@ -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>