cvs: pear-core /PEAR Config.php

From: Date: Sun, 21 Aug 2005 22:48:43 +0000
Subject: cvs: pear-core /PEAR Config.php
Groups: php.pear.cvs php.pear.core 
Request: Send a blank email to pear-core+get-3695@lists.php.net to get a copy of this message
cellog Sun Aug 21 18:48:43 2005 EDT Modified files: /pear-core/PEAR Config.php Log: wrong logic in ftp test http://cvs.php.net/diff.php/pear-core/PEAR/Config.php?r1=1.114&r2=1.115&ty=u Index: pear-core/PEAR/Config.php diff -u pear-core/PEAR/Config.php:1.114 pear-core/PEAR/Config.php:1.115 --- pear-core/PEAR/Config.php:1.114 Sat Aug 20 23:48:50 2005 +++ pear-core/PEAR/Config.php Sun Aug 21 18:48:38 2005 @@ -16,7 +16,7 @@ * @author Greg Beaver <cellog@php.net> * @copyright 1997-2005 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: Config.php,v 1.114 2005/08/21 03:48:50 cellog Exp $ + * @version CVS: $Id: Config.php,v 1.115 2005/08/21 22:48:38 cellog Exp $ * @link http://pear.php.net/package/PEAR * @since File available since Release 0.1 */ @@ -653,7 +653,8 @@ include_once 'Net/FTP.php'; } } - if (class_exists('Net_FTP') && PEAR_Common::isIncludeable('PEAR/FTP.php')) { + if (class_exists('Net_FTP') && + (class_exists('PEAR_FTP') || PEAR_Common::isIncludeable('PEAR/FTP.php'))) { require_once 'PEAR/FTP.php'; $this->_ftp = &new PEAR_FTP; $this->_ftp->pushErrorHandling(PEAR_ERROR_RETURN);

« previous php.pear.core (#3695) next »