cvs: pear-core /PEAR FTP.php RemoteInstaller.php

cellog          Thu Oct 19 23:22:36 2006 UTC

  Modified files:              
    /pear-core/PEAR     FTP.php RemoteInstaller.php 
  Log:
  fix Bug #7881: stream_copy_to_stream function args reversed
  fix bug in uninstall - $atts instead of $atts['attribs']
  
http://cvs.php.net/viewvc.cgi/pear-core/PEAR/FTP.php?r1=1.8&r2=1.9&diff_format=u
Index: pear-core/PEAR/FTP.php
diff -u pear-core/PEAR/FTP.php:1.8 pear-core/PEAR/FTP.php:1.9
--- pear-core/PEAR/FTP.php:1.8  Sun Apr  2 23:47:09 2006
+++ pear-core/PEAR/FTP.php      Thu Oct 19 23:22:36 2006
@@ -15,7 +15,7 @@
  * @author     Greg Beaver <cellog@xxxxxxx>
  * @copyright  1997-2006 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: FTP.php,v 1.8 2006/04/02 23:47:09 cellog Exp $
+ * @version    CVS: $Id: FTP.php,v 1.9 2006/10/19 23:22:36 cellog Exp $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -222,7 +222,7 @@
             return PEAR::raiseError('Could not open remote file ' .
                 $this->_prepend($remotefile) . ' for saving as local file ' . 
$localfile);
         }
-        $ret = @stream_copy_to_stream($remote, $local);
+        $ret = @stream_copy_to_stream($local, $remote);
         if ($local) {
             @fclose($local);
         }
http://cvs.php.net/viewvc.cgi/pear-core/PEAR/RemoteInstaller.php?r1=1.5&r2=1.6&diff_format=u
Index: pear-core/PEAR/RemoteInstaller.php
diff -u pear-core/PEAR/RemoteInstaller.php:1.5 
pear-core/PEAR/RemoteInstaller.php:1.6
--- pear-core/PEAR/RemoteInstaller.php:1.5      Sun Apr  2 23:42:55 2006
+++ pear-core/PEAR/RemoteInstaller.php  Thu Oct 19 23:22:36 2006
@@ -18,7 +18,7 @@
  * @author     Greg Beaver <cellog@xxxxxxx>
  * @copyright  2005-2006 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: RemoteInstaller.php,v 1.5 2006/04/02 23:42:55 cellog 
Exp $
+ * @version    CVS: $Id: RemoteInstaller.php,v 1.6 2006/10/19 23:22:36 cellog 
Exp $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1.0
  */
@@ -145,7 +145,7 @@
                     continue; // this shouldn't happen
                 }
                 list($save_destdir, $dest_dir, $dest_file, $orig_file) =
-                    $role->processInstallation($pkg, $atts['attribs'], $file, 
$tmp_path, 'ftp');
+                    $role->processInstallation($pkg, $atts, $file, $tmp_path, 
'ftp');
                 $dest_file = str_replace(DIRECTORY_SEPARATOR, '/', $dest_file);
             }
             $this->log(2, 'Deleting "' . $dest_file . '"');

-- 
PEAR CVS Mailing List (http://pear.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php