Ticket #24159: 24159.diff

post-formats.php

@@ -556 +556 @@
         $found_index = 0;
 
         foreach ( $lines as $index => $line ) {
-                if ( ! $found )
-                        $found_index = $index;
-
+                $data = array();
                 $line = trim( $line );
-
-                if ( empty( $line ) && $found ) {
-                        if ( ! empty( $author ) ) {
-                                $stanza[] = array(
-                                        'time'    => $time,
-                                        'author'  => $author,
-                                        'message' => join( ' ', $data )
-                                );
-                        }
-
-                        $stanzas[] = $stanza;
-
-                        $stanza = $data = array();
-                        $author = $time = '';
-                        if ( ! empty( $lines[$index + 1] ) && ! preg_match( $delimiter_regex, $lines[$index + 1] ) )
-                                break;
-                        else
-                                continue;
-                }
-
+                if ( empty( $line ) )
+                        continue;
                 $matched = preg_match( $newline_regex, $line, $matches );
                 if ( ! $matched )
                         continue;
-
-                $found = true;
-                $last_index = $index;
-                $author_match = empty( $matches[2] ) ? $matches[1] : $matches[2];
-                // assume username syntax if no whitespace is present
-                $no_ws = $matched && ! preg_match( '#[\r\n\t ]#', $author_match );
-                // allow script-like stanzas
-                $has_ws = $matched && preg_match( '#[\r\n\t ]#', $author_match ) && empty( $lines[$index + 1] ) && empty( $lines[$index - 1] );
-                if ( $matched && ( ! empty( $matches[2] ) || ( $no_ws || $has_ws ) ) ) {
-                        if ( ! empty( $author ) ) {
-                                $stanza[] = array(
-                                        'time'    => $time,
-                                        'author'  => $author,
-                                        'message' => join( ' ', $data )
-                                );
-                                $data = array();
-                        }
-
-                        $time = empty( $matches[2] ) ? '' : $matches[1];
-                        $author = $author_match;
-                        $data[] = trim( str_replace( $matches[0], '', $line ) );
-                } elseif ( preg_match( '#\S#', $line ) ) {
-                        $data[] = $line;
+                if ( ! empty( $matches[2] ) ) { // Time is present
+                        $time = $matches[1];
+                        $author = $matches[2];
+                } else {
+                        $time = '';
+                        $author = $matches[1];
                 }
-        }
-
-        if ( ! empty( $author ) ) {
+                $data[] = trim( str_replace( $matches[0], '', $line ) );
+                $i = $index;
+                do {
+                        $i++;
+                        $data[] = $lines[$i];
+                } while ( preg_match( $newline_regex, $lines[$i], $matches ) ); 
                 $stanza[] = array(
-                        'time'    => $time,
+                        'time'    => $time,
                         'author'  => $author,
-                        'message' => trim( join( ' ', $data ) )
-                );
+                        'message' => trim( join( ' ', $data ) ) );
         }
 
         if ( ! empty( $stanza ) )
@@ -1010 +975 @@
                 $data['post_title'] = _post_formats_generate_title( $data['post_content'], $post_format );
 
         return $data;
-}
- Pas de retour chariot à la fin du fichier
+}