Ticket #23625: 23625.11.diff

wp-includes/post-formats.php

@@ -392 +392 @@
 }
 
 /**
- * Add chat detection support to the `get_content_chat()` chat parser
+ * Add chat detection support to the `get_content_chat()` chat parser.
  *
  * @since 3.6.0
  *
@@ -459 +459 @@
         if ( empty( $trimmed ) )
                 return array();
 
-        $has_match = false;
         $matched_parser = false;
         foreach ( $_wp_chat_parsers as $parser ) {
-                @list( $newline_regex ) = $parser;
+                @list( $newline_regex, $delimiter_regex ) = $parser;
                 if ( preg_match( $newline_regex, $trimmed ) ) {
-                        $has_match = true;
                         $matched_parser = $parser;
                         break;
                 }
@@ -473 +471 @@
         if ( false === $matched_parser )
                 return array();
 
-        @list( $newline_regex, $delimiter_regex ) = $parser;
-
         $last_index = 0;
-        $stanzas = array();
+        $stanzas = $data = $stanza = array();
+        $author = $time = '';
         $lines = explode( "\n", make_clickable( $trimmed ) );
 
-        $author = $time = '';
-        $data = array();
-        $stanza = array();
 
         foreach ( $lines as $index => $line ) {
                 $line = trim( $line );
@@ -489 +483 @@
                 if ( empty( $line ) ) {
                         if ( ! empty( $author ) ) {
                                 $stanza[] = array(
-                                        'time' => $time,
-                                        'author' => $author,
+                                        'time'    => $time,
+                                        'author'  => $author,
                                         'message' => join( ' ', $data )
                                 );
                         }
 
                         $stanzas[] = $stanza;
                         $last_index = $index;
-                        $stanza = array();
+                        $stanza = $data = array();
                         $author = $time = '';
-                        $data = array();
                         if ( ! empty( $lines[$index + 1] ) && ! preg_match( $delimiter_regex, $lines[$index + 1] ) )
                                 break;
                 }
@@ -514 +507 @@
                 if ( $matched && ( ! empty( $matches[2] ) || ( $no_ws || $has_ws ) ) ) {
                         if ( ! empty( $author ) ) {
                                 $stanza[] = array(
-                                        'time' => $time,
-                                        'author' => $author,
+                                        'time'    => $time,
+                                        'author'  => $author,
                                         'message' => join( ' ', $data )
                                 );
                                 $data = array();
@@ -531 +524 @@
 
         if ( ! empty( $author ) ) {
                 $stanza[] = array(
-                        'time' => $time,
-                        'author' => $author,
+                        'time'    => $time,
+                        'author'  => $author,
                         'message' => trim( join( ' ', $data ) )
                 );
         }
@@ -577 +570 @@
  * @print HTML
  */
 function the_chat() {
-        $output = '<dl class="chat-transcript">';
-
+        $output  = '<dl class="chat">';
         $stanzas = get_the_chat();
 
         foreach ( $stanzas as $stanza ) {
                 foreach ( $stanza as $row ) {
                         $time = '';
                         if ( ! empty( $row['time'] ) )
-                                $time = sprintf( '<time>%s</time>', esc_html( $row['time'] ) );
+                                $time = sprintf( '<time class="chat-timestamp">%s</time>', esc_html( $row['time'] ) );
 
                         $output .= sprintf(
                                 '<dt class="chat-author chat-author-%1$s vcard">%2$s <cite class="fn">%3$s</cite>: </dt>
                                         <dd class="chat-text">%4$s</dd>
                                 ',
-                                esc_attr( strtolower( $row['author'] ) ), // Slug.
+                                esc_attr( sanitize_title_with_dashes( $row['author'] ) ), // Slug.
                                 $time,
                                 esc_html( $row['author'] ),
-                                esc_html( $row['message'] )
+                                $row['message']
                         );
                 }
         }
 
-        $output .= '</dl><!-- .chat-transcript -->';
+        $output .= '</dl><!-- .chat -->';
 
         echo $output;
 }

wp-includes/query.php

@@ -3626 +3626 @@
  *
  * @since 3.6.0
  *
- * @param string $content Content to split
- * @return array Paged content
+ * @param string $content Content to split.
+ * @return array Paged content.
  */
 function paginate_content( $content ) {
         $content = str_replace( "\n<!--nextpage-->\n", '<!--nextpage-->', $content );
-        $content = str_replace( "\n<!--nextpage-->", '<!--nextpage-->', $content );
-        $content = str_replace( "<!--nextpage-->\n", '<!--nextpage-->', $content );
-        return explode( '<!--nextpage-->', $content);
+        $content = str_replace( "\n<!--nextpage-->",   '<!--nextpage-->', $content );
+        $content = str_replace( "<!--nextpage-->\n",   '<!--nextpage-->', $content );
+        return explode( '<!--nextpage-->', $content );
 }
 
 /**
@@ -3642 +3642 @@
  * @since 3.6.0
  *
  * @param string $content
+ * @param int $paged
  * @return string
  */
-function get_paged_content( $content = null, $paged = null ) {
+function get_paged_content( $content = '', $paged = 0 ) {
         global $page;
         if ( empty( $page ) )
                 $page = 1;
@@ -3655 +3656 @@
         if ( empty( $content ) ) {
                 $post = get_post();
                 if ( empty( $post ) )
-                        return;
+                        return '';
 
                 $content = $post->post_content;
         }