Ticket #23625: 23625.15.diff

wp-includes/post-formats.php

@@ -453 +453 @@
         $_wp_chat_parsers = array( $name => array( $newline_regex, $delimiter_regex ) ) + $_wp_chat_parsers;
 }
 add_chat_detection_format( 'IM', '#^([^:]+):#', '#[:]#' );
-add_chat_detection_format( 'Skype', '#^(\[.+?\])\s([^:]+):#', '#[:]#' );
+add_chat_detection_format( 'Skype', '#(\[.+?\])\s([^:]+):#', '#[:]#' );
 
 /**
  * Deliberately interpret passed content as a chat transcript that is optionally
@@ -492 +492 @@
 function get_content_chat( &$content, $remove = false ) {
         global $_wp_chat_parsers;
 
-        $trimmed = trim( $content );
+        $trimmed = strip_tags( trim( $content ) );
         if ( empty( $trimmed ) )
                 return array();
 
@@ -512 +512 @@
         $stanzas = $data = $stanza = array();
         $author = $time = '';
         $lines = explode( "\n", make_clickable( $trimmed ) );
-
+        $found = false;
+        $found_index = 0;
 
         foreach ( $lines as $index => $line ) {
+                if ( ! $found )
+                        $found_index = $index;
+
                 $line = trim( $line );
 
-                if ( empty( $line ) ) {
+                if ( empty( $line ) && $found ) {
                         if ( ! empty( $author ) ) {
                                 $stanza[] = array(
                                         'time'    => $time,
@@ -527 +531 @@
                         }
 
                         $stanzas[] = $stanza;
-                        $last_index = $index;
+
                         $stanza = $data = array();
                         $author = $time = '';
                         if ( ! empty( $lines[$index + 1] ) && ! preg_match( $delimiter_regex, $lines[$index + 1] ) )
@@ -538 +542 @@
 
                 $matches = array();
                 $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 );
@@ -572 +581 @@
         if ( ! empty( $stanza ) )
                 $stanzas[] = $stanza;
 
-        if ( $remove )
-                $content = trim( join( "\n", array_slice( $lines, $last_index ) ) );
+        if ( $remove ) {
+                if ( 0 === $found_index ) {
+                        $removed = array_slice( $lines, $last_index );
+                } else {
+                        $before = array_slice( $lines, 0, $found_index );
+                        $after = array_slice( $lines, $last_index + 1 );
+                        $removed = array_filter( array_merge( $before, $after ) );
+                }
+                $content = trim( join( "\n", $removed ) );
+        }
 
         return $stanzas;
 }