Re: cvs: pear-core(PEAR_1_3) / PEAR.php go-pear-list.php package-PEAR.xml /PEAR Remote.php

On 8/18/2005 12:02 AM, Greg Beaver spake the following words: > cellog Wed Aug 17 18:02:01 2005 EDT > > Modified files: (Branch: PEAR_1_3) > /pear-core PEAR.php go-pear-list.php package-PEAR.xml > /pear-core/PEAR Remote.php > Log: > re-enable XML_RPC 1.4.0 > add return by ref from PEAR::raiseError snip... > > http://cvs.php.net/diff.php/pear-core/PEAR/Remote.php?r1=1.50.2.1&r2=1.50.2.2&ty=u > Index: pear-core/PEAR/Remote.php > diff -u pear-core/PEAR/Remote.php:1.50.2.1 pear-core/PEAR/Remote.php:1.50.2.2 > --- pear-core/PEAR/Remote.php:1.50.2.1 Thu Aug 11 17:46:59 2005 > +++ pear-core/PEAR/Remote.php Wed Aug 17 18:02:01 2005 > @@ -16,7 +16,7 @@ > // | Author: Stig Bakken <ssb@php.net> | > // +----------------------------------------------------------------------+ > // > -// $Id: Remote.php,v 1.50.2.1 2005/08/11 21:46:59 pajoye Exp $ > +// $Id: Remote.php,v 1.50.2.2 2005/08/17 22:02:01 cellog Exp $ > > require_once 'PEAR.php'; > require_once 'PEAR/Config.php'; > @@ -115,9 +115,9 @@ > $this->saveCache($_args, $result); > }; > return $result; > - } else { > - return $this->raiseError("For this remote PEAR operation you need to load > the xmlrpc extension"); > } > + if (!@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'); > Should have been - } else { - return $this->raiseError("For this remote PEAR operation you need to load the xmlrpc extension"); + }elseif (!@include_once("XML/RPC.php")) { + return $this->raiseError("For this remote PEAR operation you need to install the XML_RPC package"); } This commit broke the file because it introduced an unclosed if clause. Thanks to toggg for his work finding the problem :) Klaus