Changeset 13468

Timestamp:

02/27/2010 08:06:35 PM (17 years ago)

Author:

nacin

Message:

Add some whitespace to get_body_class(). props coffee2code. Clarify fallback parameter in sanitize_html_class(). see #11331

Location:

trunk/wp-includes

Files:

• formatting.php (modified) (2 diffs)
• post-template.php (modified) (6 diffs)

trunk/wp-includes/formatting.php

@@ -843 +843 @@
  *
  * @param string $class The classname to be sanitized
- * @param string $fallback The value to return if the sanitization end's up as an empty string.
+ * @param string $fallback Optional. The value to return if the sanitization end's up as an empty string.
+ *      Defaults to an empty string.
  * @return string The sanitized value
  */
-function sanitize_html_class($class, $fallback){
+function sanitize_html_class( $class, $fallback = '' ) {
         //Strip out any % encoded octets
         $sanitized = preg_replace('|%[a-fA-F0-9][a-fA-F0-9]|', '', $class);
@@ -853 +854 @@
         $sanitized = preg_replace('/[^A-Za-z0-9-]/', '', $sanitized);
 
-        if ('' == $sanitized)
+        if ( '' == $sanitized )
                 $sanitized = $fallback;
 
-        return apply_filters('sanitize_html_class',$sanitized, $class, $fallback);
+        return apply_filters( 'sanitize_html_class', $sanitized, $class, $fallback );
 }
 

trunk/wp-includes/post-template.php

@@ -373 +373 @@
         $classes = array();
 
-        if ( 'rtl' == get_bloginfo('text_direction') )
+        if ( 'rtl' == get_bloginfo( 'text_direction' ) )
                 $classes[] = 'rtl';
 
@@ -405 +405 @@
                         $mime_prefix = array( 'application/', 'image/', 'text/', 'audio/', 'video/', 'music/' );
                         $classes[] = 'attachmentid-' . $post_id;
-                        $classes[] = 'attachment-' . str_replace($mime_prefix, '', $mime_type);
+                        $classes[] = 'attachment-' . str_replace( $mime_prefix, '', $mime_type );
                 }
         } elseif ( is_archive() ) {
@@ -411 +411 @@
                         $author = $wp_query->get_queried_object();
                         $classes[] = 'author';
-                        $classes[] = 'author-' . sanitize_html_class($author->user_nicename , $author->ID);
+                        $classes[] = 'author-' . sanitize_html_class( $author->user_nicename , $author->ID );
                 } elseif ( is_category() ) {
                         $cat = $wp_query->get_queried_object();
                         $classes[] = 'category';
-                        $classes[] = 'category-' . sanitize_html_class($cat->slug, $cat->cat_ID);
+                        $classes[] = 'category-' . sanitize_html_class( $cat->slug, $cat->cat_ID );
                 } elseif ( is_tag() ) {
                         $tags = $wp_query->get_queried_object();
                         $classes[] = 'tag';
-                        $classes[] = 'tag-' . sanitize_html_class($tags->slug, $tags->term_id);
+                        $classes[] = 'tag-' . sanitize_html_class( $tags->slug, $tags->term_id );
                 }
         } elseif ( is_page() ) {
@@ -442 +442 @@
                 }
         } elseif ( is_search() ) {
-                if ( !empty($wp_query->posts) )
+                if ( !empty( $wp_query->posts ) )
                         $classes[] = 'search-results';
                 else
@@ -451 +451 @@
                 $classes[] = 'logged-in';
 
-        $page = $wp_query->get('page');
+        $page = $wp_query->get( 'page' );
 
         if ( !$page || $page < 2)
-                $page = $wp_query->get('paged');
+                $page = $wp_query->get( 'paged' );
 
         if ( $page && $page > 1 ) {
@@ -475 +475 @@
         }
 
-        if ( !empty($class) ) {
+        if ( !empty( $class ) ) {
                 if ( !is_array( $class ) )
-                        $class = preg_split('#\s+#', $class);
-                $classes = array_merge($classes, $class);
-        }
-
-        $classes = array_map('esc_attr', $classes);
-
-        return apply_filters('body_class', $classes, $class);
+                        $class = preg_split( '#\s+#', $class );
+                $classes = array_merge( $classes, $class );
+        }
+
+        $classes = array_map( 'esc_attr', $classes );
+
+        return apply_filters( 'body_class', $classes, $class );
 }