Patch patch1.patch for *General Issues Bug #67943

Patch version 2014-09-01 14:34 UTC

• 2014-09-01 14:34 UTC [diff to current]

Developer: phpbug@monumentmail.com

--- 1/index.php	2014-08-31 10:46:49.117195207 +0200
+++ 2/index.php	2014-09-01 11:39:30.000000000 +0200
@@ -205,7 +205,7 @@
 $install_root = getenv('INSTALL_ROOT');
 if (!empty($install_root)) {
     $options['packagingroot'] = $install_root;
-    $reg = &new PEAR_Registry($options['packagingroot']);
+    $reg = &new PEAR_Registry($options['packagingroot'] . DIRECTORY_SEPARATOR . $config->get('php_dir'));
 } else {
     $reg = $config->getRegistry('default');
 }
@@ -246,7 +246,7 @@
                 $ui->outputData(sprintf("[PEAR] %s: %s", $package, $err->getMessage()));
                 continue;
             }
-            $ui->outputData(sprintf("[PEAR] %-15s- upgraded:  %s", $package, $new_ver));
+            $ui->outputData(sprintf("[PEAR] %-17s- upgraded:  %s", $package, $new_ver));
         } else {
             if ($force) {
                 $options['force'] = true;
@@ -258,9 +258,9 @@
                     $ui->outputData(sprintf("[PEAR] %s: %s", $package, $err->getMessage()));
                     continue;
                 }
-                $ui->outputData(sprintf("[PEAR] %-15s- installed: %s", $package, $new_ver));
+                $ui->outputData(sprintf("[PEAR] %-17s- installed: %s", $package, $new_ver));
             } else {
-                $ui->outputData(sprintf("[PEAR] %-15s- already installed: %s", $package, $old_ver));
+                $ui->outputData(sprintf("[PEAR] %-17s- already installed: %s", $package, $old_ver));
             }
         }
     } else {
@@ -273,7 +273,7 @@
             $ui->outputData(sprintf("[PEAR] %s: %s", $package, $err->getMessage()));
             continue;
         }
-        $ui->outputData(sprintf("[PEAR] %-15s- installed: %s", $package, $new_ver));
+        $ui->outputData(sprintf("[PEAR] %-17s- installed: %s", $package, $new_ver));
     }
     if ($package == 'PEAR') {
         if (is_file($ufile = $config->getConfFile('user'))) {