Move the _prependPath function into PEAR_Downloader from PEAR_Installer,

as PEAR_Downloader uses it (and PEAR_Installer inherits PEAR_Downloader).

Unbreaks 'pear install -R'

2 files changed, 14 insertions, 15 deletions

diff --git a/pear/PEAR/Downloader.php b/pear/PEAR/Downloader.php
index 9bdec76663..56182d2b66 100644
--- a/pear/PEAR/Downloader.php
+++ b/pear/PEAR/Downloader.php
@@ -613,6 +613,20 @@ class PEAR_Downloader extends PEAR_Common
     }
 
     // }}}
+    // {{{ _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 e68e634ea8..f998d4c751 100644
--- a/pear/PEAR/Installer.php
+++ b/pear/PEAR/Installer.php
@@ -540,21 +540,6 @@ class PEAR_Installer extends PEAR_Downloader
     }
 
     // }}}
-    // {{{ _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()
 
     /**