svn: /pear/pear-core/trunk/PEAR/Command/ Registry.php

dufuz                                    Sat, 08 May 2010 16:26:13 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=299146

Log:
Bug #17378: pear info $package fails if directory with that name exists [dufuz]

Bug: http://pear.php.net/bugs/17378 (unknown) 
      
Changed paths:
    U   pear/pear-core/trunk/PEAR/Command/Registry.php

Modified: pear/pear-core/trunk/PEAR/Command/Registry.php
===================================================================
--- pear/pear-core/trunk/PEAR/Command/Registry.php	2010-05-08 16:00:45 UTC (rev 299145)
+++ pear/pear-core/trunk/PEAR/Command/Registry.php	2010-05-08 16:26:13 UTC (rev 299146)
@@ -424,7 +424,9 @@

         $info = $fp = false;
         $reg = &$this->config->getRegistry();
-        if ((file_exists($params[0]) && is_file($params[0]) && !is_dir($params[0])) || $fp = @fopen($params[0], 'r')) {
+        if (is_file($params[0]) && !is_dir($params[0]) &&
+            (file_exists($params[0]) || $fp = @fopen($params[0], 'r'))
+        ) {
             if ($fp) {
                 fclose($fp);
             }