MFH 'pear install -R' fix, ilia@ ok

diff --git a/pear/PEAR/Downloader.php b/pear/PEAR/Downloader.php
index 69c3e077aefe544664079cd2de7698125ca2f5e2..676e3805a01a8f6e3c52e0f21e0abe25b0fe0273 100644 (file)
--- a/pear/PEAR/Downloader.php
+++ b/pear/PEAR/Downloader.php
@@ -612,6 +612,20 @@ class PEAR_Downloader extends PEAR_Common
             $this->ui->_downloadCallback($msg, $params);
     }
 
+    // }}}
+    // {{{ _prependPath($path, $prepend)
+
+    function _prependPath($path, $prepend)
+    {
+        if (strlen($prepend) > 0) {
+            if (OS_WINDOWS && preg_match('/^[a-z]:/i', $path)) {
+                $path = $prepend . substr($path, 2);
+            } else {
+                $path = $prepend . $path;
+            }
+        }
+        return $path;
+    }
     // }}}
     // {{{ pushError($errmsg, $code)
     

diff --git a/pear/PEAR/Installer.php b/pear/PEAR/Installer.php
index 8b79ff15c9618563476b12d5ca11288330743be7..be9339eea17fc74c441a2190cbfcc363a281b527 100644 (file)
--- a/pear/PEAR/Installer.php
+++ b/pear/PEAR/Installer.php
@@ -539,21 +539,6 @@ class PEAR_Installer extends PEAR_Downloader
         return parent::mkDirHier($dir);
     }
 
-    // }}}
-    // {{{ _prependPath($path, $prepend)
-
-    function _prependPath($path, $prepend)
-    {
-        if (strlen($prepend) > 0) {
-            if (OS_WINDOWS && preg_match('/^[a-z]:/i', $path)) {
-                $path = $prepend . substr($path, 2);
-            } else {
-                $path = $prepend . $path;
-            }
-        }
-        return $path;
-    }
-
     // }}}
     // {{{ download()