cvs: pear(MAINT_1_3_4) /Net_FTP generate_package_xml.php /Net_FTP/Net FTP.php

jschippers		Tue Apr 22 20:51:19 2008 UTC

  Modified files:              (Branch: MAINT_1_3_4)
    /pear/Net_FTP	generate_package_xml.php 
    /pear/Net_FTP/Net	FTP.php 
  Log:
  Bug #13690: getRecursive does not work because of '.' and '..' directories 
  
http://cvs.php.net/viewvc.cgi/pear/Net_FTP/generate_package_xml.php?r1=1.15.2.3&r2=1.15.2.4&diff_format=u
Index: pear/Net_FTP/generate_package_xml.php
diff -u pear/Net_FTP/generate_package_xml.php:1.15.2.3 pear/Net_FTP/generate_package_xml.php:1.15.2.4
--- pear/Net_FTP/generate_package_xml.php:1.15.2.3	Tue Apr 22 20:41:19 2008
+++ pear/Net_FTP/generate_package_xml.php	Tue Apr 22 20:51:18 2008
@@ -26,7 +26,9 @@
 	
 $current_notes =
 '* Fixed Bug #13496: set bit not supported
-* Fixed Bug #13689: . in file owner or group name breaks _ls_match';
+* Fixed Bug #13689: . in file owner or group name breaks _ls_match
+* Fixed Bug #13690: getRecursive does not work because of \'.\' and \'..\' '.
+'directories';
 
 PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'dumpError');
 
http://cvs.php.net/viewvc.cgi/pear/Net_FTP/Net/FTP.php?r1=1.53.2.6&r2=1.53.2.7&diff_format=u
Index: pear/Net_FTP/Net/FTP.php
diff -u pear/Net_FTP/Net/FTP.php:1.53.2.6 pear/Net_FTP/Net/FTP.php:1.53.2.7
--- pear/Net_FTP/Net/FTP.php:1.53.2.6	Tue Apr 22 20:41:19 2008
+++ pear/Net_FTP/Net/FTP.php	Tue Apr 22 20:51:18 2008
@@ -20,7 +20,7 @@
  * @author    Jorrit Schippers <[email protected]>
  * @copyright 1997-2008 The PHP Group
  * @license   http://www.php.net/license/3_0.txt PHP License 3.0
- * @version   CVS: $Id: FTP.php,v 1.53.2.6 2008/04/22 20:41:19 jschippers Exp $
+ * @version   CVS: $Id: FTP.php,v 1.53.2.7 2008/04/22 20:51:18 jschippers Exp $
  * @link      http://pear.php.net/package/Net_FTP
  * @since     File available since Release 0.0.1
  */
@@ -974,7 +974,7 @@
             $mode     = NET_FTP_DIRS_ONLY;
             $dir_list = $this->ls($remote_path, $mode);
             foreach ($dir_list as $dir_entry) {
-                if ($dir_entry == '.' || $dir_entry == '..') {
+                if ($dir_entry['name'] == '.' || $dir_entry['name'] == '..') {
                     continue;
                 }
                 
@@ -1508,8 +1508,8 @@
         $this->cd($old_path);
         $dir_list = $this->_lsLocal($local_path);
         foreach ($dir_list["dirs"] as $dir_entry) {
-            $remote_path_new = $remote_path.$dir_entry."/";
-            $local_path_new  = $local_path.$dir_entry."/";
+            $remote_path_new = $remote_path.$dir_entry['name']."/";
+            $local_path_new  = $local_path.$dir_entry['name']."/";
             $result          = $this->putRecursive($local_path_new,
                                $remote_path_new, $overwrite, $mode);
             if ($this->isError($result)) {