svn: /pear/pear-core/tags/PEAR-1.9.2/PEAR/Frontend/ CLI.php

dufuz                                    Fri, 25 Feb 2011 23:35:49 +0000

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

Log:
Fixed bug #17997 Strange output if directories are not writeable [dufuz]

# Backported from trunk

Bug: http://pear.php.net/bugs/17997 (unknown) 
      
Changed paths:
    U   pear/pear-core/tags/PEAR-1.9.2/PEAR/Frontend/CLI.php

Modified: pear/pear-core/tags/PEAR-1.9.2/PEAR/Frontend/CLI.php
===================================================================
--- pear/pear-core/tags/PEAR-1.9.2/PEAR/Frontend/CLI.php	2011-02-25 23:32:16 UTC (rev 308693)
+++ pear/pear-core/tags/PEAR-1.9.2/PEAR/Frontend/CLI.php	2011-02-25 23:35:49 UTC (rev 308694)
@@ -396,7 +396,7 @@
             case 'install':
             case 'upgrade':
             case 'upgrade-all':
-                if (isset($data['release_warnings'])) {
+                if (is_array($data) && isset($data['release_warnings'])) {
                     $this->_displayLine('');
                     $this->_startTable(array(
                         'border' => false,
@@ -407,7 +407,7 @@
                     $this->_displayLine('');
                 }

-                $this->_displayLine($data['data']);
+                $this->_displayLine(is_array($data) ? $data['data'] : $data);
                 break;
             case 'search':
                 $this->_startTable($data);