Changeset 11435

Timestamp:

05/22/2009 09:31:42 PM (16 years ago)

Author:

westi

Message:

Rename new function to sanitize_html_class() to hilight exactly what it is for, Fixes #8446.

Location:

trunk/wp-includes

Files:

• comment-template.php (modified) (1 diff)
• formatting.php (modified) (1 diff)
• post-template.php (modified) (3 diffs)

trunk/wp-includes/comment-template.php

@@ -295 +295 @@
         // For all registered users, 'byuser'
         $classes[] = 'byuser';
-        $classes[] = 'comment-author-' . sanitise_css_classname($user->user_nicename, $comment->user_id);
+        $classes[] = 'comment-author-' . sanitize_html_class($user->user_nicename, $comment->user_id);
         // For comment authors who are the author of the post
         if ( $post = get_post($post_id) ) {

trunk/wp-includes/formatting.php

@@ -720 +720 @@
 
 /**
- * Santises a css classname to ensure it only contains valid characters
+ * Santizes a html classname to ensure it only contains valid characters
  * 
- * Strips the classname down to A-Z,a-z,0-9,'-' if this results in an empty
+ * Strips the string down to A-Z,a-z,0-9,'-' if this results in an empty
  * string then it will return the alternative value supplied.
+ * 
+ * @todo Expand to support the full range of CDATA that a class attribute can contain.
  *  
- * @param string $classname The classname to be sanitised
- * @param string $alternative The value to return if the sanitisation end's up as an empty string.
- * @return string The sanitised value
- */
-function sanitise_css_classname($classname, $alternative){
+ * @since 2.8.0
+ *  
+ * @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.
+ * @return string The sanitized value
+ */
+function sanitize_html_class($class, $fallback){
     //Strip out any % encoded octets
-    $sanitised = preg_replace('|%[a-fA-F0-9][a-fA-F0-9]|', '', $classname);
+    $sanitized = preg_replace('|%[a-fA-F0-9][a-fA-F0-9]|', '', $class);
     
     //Limit to A-Z,a-z,0-9,'-'
-    $sanitised = preg_replace('/[^A-Za-z0-9-]/', '', $sanitised);
+    $sanitized = preg_replace('/[^A-Za-z0-9-]/', '', $sanitized);
     
-    if ('' == $sanitised)
-        $sanitised = $alternative;
+    if ('' == $sanitized)
+        $sanitized = $fallback;
     
-    return apply_filters('sanitise_css_classname',$sanitised, $classname, $alternative);    
+    return apply_filters('sanitize_html_class',$sanitized, $class, $fallback);  
 }
 

trunk/wp-includes/post-template.php

@@ -327 +327 @@
         if ( empty($cat->slug ) )
             continue;
-        $classes[] = 'category-' . sanitise_css_classname($cat->slug, $cat->cat_ID);
+        $classes[] = 'category-' . sanitize_html_class($cat->slug, $cat->cat_ID);
     }
 
@@ -334 +334 @@
         if ( empty($tag->slug ) )
             continue;
-        $classes[] = 'tag-' . sanitise_css_classname($tag->slug, $tag->term_id);
+        $classes[] = 'tag-' . sanitize_html_class($tag->slug, $tag->term_id);
     }
 
@@ -408 +408 @@
             $author = $wp_query->get_queried_object();
             $classes[] = 'author';
-            $classes[] = 'author-' . sanitise_css_classname($author->user_nicename , $author->user_id);
+            $classes[] = 'author-' . sanitize_html_class($author->user_nicename , $author->user_id);
         } elseif ( is_category() ) {
             $cat = $wp_query->get_queried_object();
             $classes[] = 'category';
-            $classes[] = 'category-' . sanitise_css_classname($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-' . sanitise_css_classname($tags->slug, $tags->term_id);
+            $classes[] = 'tag-' . sanitize_html_class($tags->slug, $tags->term_id);
         }
     } elseif ( is_page() ) {