Changeset 23876

Timestamp:

03/29/2013 09:06:37 PM (12 years ago)

Author:

markjaquith

Message:

Chat post format code cleanup.

see #23625. props obenland.

Location:

trunk/wp-includes

Files:

• post-formats.php (modified) (10 diffs)
• query.php (modified) (3 diffs)

trunk/wp-includes/post-formats.php

@@ -418 +418 @@
 
 /**
- * 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
@@ -485 +485 @@
         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;
@@ -499 +497 @@
         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 ) {
@@ -515 +509 @@
             if ( ! empty( $author ) ) {
                 $stanza[] = array(
-                    'time' => $time,
-                    'author' => $author,
+                    'time'    => $time,
+                    'author'  => $author,
                     'message' => join( ' ', $data )
                 );
@@ -523 +517 @@
             $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;
@@ -540 +533 @@
             if ( ! empty( $author ) ) {
                 $stanza[] = array(
-                    'time' => $time,
-                    'author' => $author,
+                    'time'    => $time,
+                    'author'  => $author,
                     'message' => join( ' ', $data )
                 );
@@ -557 +550 @@
     if ( ! empty( $author ) ) {
         $stanza[] = array(
-            'time' => $time,
-            'author' => $author,
+            'time'    => $time,
+            'author'  => $author,
             'message' => trim( join( ' ', $data ) )
         );
@@ -603 +596 @@
  */
 function the_chat() {
-    $output = '<dl class="chat-transcript">';
-
+    $output  = '<dl class="chat">';
     $stanzas = get_the_chat();
 
@@ -611 +603 @@
             $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(
@@ -617 +609 @@
                     <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;

trunk/wp-includes/query.php

@@ -3627 +3627 @@
  * @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 );
 }
 
@@ -3643 +3643 @@
  *
  * @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 ) )
@@ -3656 +3657 @@
         $post = get_post();
         if ( empty( $post ) )
-            return;
+            return '';
 
         $content = $post->post_content;