cvs: pear-core /PEAR Registry.php

cellog          Sun Mar 26 21:38:37 2006 UTC

  Modified files:              
    /pear-core/PEAR     Registry.php 
  Log:
  merge in critical changes from PEAR 1.4.9
  
http://cvs.php.net/viewcvs.cgi/pear-core/PEAR/Registry.php?r1=1.152&r2=1.153&diff_format=u
Index: pear-core/PEAR/Registry.php
diff -u pear-core/PEAR/Registry.php:1.152 pear-core/PEAR/Registry.php:1.153
--- pear-core/PEAR/Registry.php:1.152   Sat Mar 25 21:09:08 2006
+++ pear-core/PEAR/Registry.php Sun Mar 26 21:38:37 2006
@@ -17,7 +17,7 @@
  * @author     Greg Beaver <cellog@xxxxxxx>
  * @copyright  1997-2006 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Registry.php,v 1.152 2006/03/25 21:09:08 cellog Exp $
+ * @version    CVS: $Id: Registry.php,v 1.153 2006/03/26 21:38:37 cellog Exp $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1
  */
@@ -1286,10 +1286,13 @@
     {
         $ch = false;
         if ($this->_channelExists($channel, $noaliases)) {
-            if (!class_exists('PEAR_ChannelFile')) {
-                require_once 'PEAR/ChannelFile.php';
+            $chinfo = $this->_channelInfo($channel, $noaliases);
+            if ($chinfo) {
+                if (!class_exists('PEAR_ChannelFile')) {
+                    require_once 'PEAR/ChannelFile.php';
+                }
+                $ch = &PEAR_ChannelFile::fromArrayWithErrors($chinfo);
             }
-            $ch = 
&PEAR_ChannelFile::fromArrayWithErrors($this->_channelInfo($channel, 
$noaliases));
         }
         if ($ch) {
             if ($ch->validate()) {