Ticket #26802: 26802.diff

class-wp-filesystem-ftpext.php

@@ -291 +291 @@
                 if ( is_null($is_windows) )
                         $is_windows = stripos( ftp_systype($this->link), 'win') !== false;
 
-                if ( $is_windows && preg_match('/([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|<DIR>) +(.+)/', $line, $lucifer) ) {
+                if ( $is_windows && preg_match( '/([0-9]{2})-([0-9]{2})-([0-9]{2,4}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|<DIR>) +(.+)/', $line, $lucifer ) ) {
                         $b = array();
                         if ( $lucifer[3] < 70 )
                                 $lucifer[3] +=2000;
-                        else
+                        elseif ( $lucifer[3] < 1900 )
                                 $lucifer[3] += 1900; // 4digit year fix
                         $b['isdir'] = ( $lucifer[7] == '<DIR>');
                         if ( $b['isdir'] )
                                 $b['type'] = 'd';
                         else
                                 $b['type'] = 'f';
-                        $b['size'] = $lucifer[7];
+                        $b['size'] = $b['isdir'] ? 0 : $lucifer[7];
                         $b['month'] = $lucifer[1];
                         $b['day'] = $lucifer[2];
                         $b['year'] = $lucifer[3];
                         $b['hour'] = $lucifer[4];
+                        if ( strcasecmp( $lucifer[6], "PM" ) == 0 )
+                                $b['hour'] += 12;
                         $b['minute'] = $lucifer[5];
-                        $b['time'] = @mktime($lucifer[4] + (strcasecmp($lucifer[6], "PM") == 0 ? 12 : 0), $lucifer[5], 0, $lucifer[1], $lucifer[2], $lucifer[3]);
-                        $b['am/pm'] = $lucifer[6];
+                        $b['time'] = @mktime( $b['hour'], $b['minute'], 0, $b['month'], $b['day'], $b['year'] );
                         $b['name'] = $lucifer[8];
-                } elseif ( !$is_windows && $lucifer = preg_split('/[ ]/', $line, 9, PREG_SPLIT_NO_EMPTY)) {
-                        //echo $line."\n";
+                } elseif ( $lucifer = preg_split( '/[ ]/', $line, 9, PREG_SPLIT_NO_EMPTY ) ) {
                         $lcount = count($lucifer);
                         if ( $lcount < 8 )
                                 return '';