Changeset 11204 for trunk/wp-includes/general-template.php

Timestamp:

05/05/2009 07:43:53 PM (16 years ago)

Author:

markjaquith

Message:

_a(), _ea(), _xa(), attr() are now esc_attr(), esc_attr_e(), esc_attr_x(), esc_attr() -- still short, but less cryptic. see #9650

File:

• trunk/wp-includes/general-template.php (modified) (8 diffs)

trunk/wp-includes/general-template.php

@@ -121 +121 @@
     $form = '<form role="search" method="get" id="searchform" action="' . get_option('home') . '/" >
     <div><label class="invisible" for="s">' . __('Search for:') . '</label>
-    <input type="text" value="' . attr(apply_filters('the_search_query', get_search_query())) . '" name="s" id="s" />
-    <input type="submit" id="searchsubmit" value="'. _a('Search') .'" />
+    <input type="text" value="' . esc_attr(apply_filters('the_search_query', get_search_query())) . '" name="s" id="s" />
+    <input type="submit" id="searchsubmit" value="'. esc_attr__('Search') .'" />
     </div>
     </form>';
@@ -689 +689 @@
 function get_archives_link($url, $text, $format = 'html', $before = '', $after = '') {
     $text = wptexturize($text);
-    $title_text = attr($text);
+    $title_text = esc_attr($text);
     $url = clean_url($url);
 
@@ -1435 +1435 @@
     $args = wp_parse_args( $args, $defaults );
 
-    echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . attr(sprintf( $args['feedtitle'], get_bloginfo('name') )) . '" href="' . get_feed_link() . "\" />\n";
-    echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . attr(sprintf( $args['comstitle'], get_bloginfo('name') )) . '" href="' . get_feed_link( 'comments_' . get_default_feed() ) . "\" />\n";
+    echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . esc_attr(sprintf( $args['feedtitle'], get_bloginfo('name') )) . '" href="' . get_feed_link() . "\" />\n";
+    echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . esc_attr(sprintf( $args['comstitle'], get_bloginfo('name') )) . '" href="' . get_feed_link( 'comments_' . get_default_feed() ) . "\" />\n";
 }
 
@@ -1468 +1468 @@
 
         if ( comments_open() || pings_open() || $post->comment_count > 0 ) {
-            $title = attr(sprintf( $args['singletitle'], get_bloginfo('name'), $args['separator'], wp_specialchars( get_the_title() ) ));
+            $title = esc_attr(sprintf( $args['singletitle'], get_bloginfo('name'), $args['separator'], wp_specialchars( get_the_title() ) ));
             $href = get_post_comments_feed_link( $post->ID );
         }
@@ -1474 +1474 @@
         $cat_id = intval( get_query_var('cat') );
 
-        $title = attr(sprintf( $args['cattitle'], get_bloginfo('name'), $args['separator'], get_cat_name( $cat_id ) ));
+        $title = esc_attr(sprintf( $args['cattitle'], get_bloginfo('name'), $args['separator'], get_cat_name( $cat_id ) ));
         $href = get_category_feed_link( $cat_id );
     } elseif ( is_tag() ) {
@@ -1480 +1480 @@
         $tag = get_tag( $tag_id );
 
-        $title = attr(sprintf( $args['tagtitle'], get_bloginfo('name'), $args['separator'], $tag->name ));
+        $title = esc_attr(sprintf( $args['tagtitle'], get_bloginfo('name'), $args['separator'], $tag->name ));
         $href = get_tag_feed_link( $tag_id );
     } elseif ( is_author() ) {
         $author_id = intval( get_query_var('author') );
 
-        $title = attr(sprintf( $args['authortitle'], get_bloginfo('name'), $args['separator'], get_author_name( $author_id ) ));
+        $title = esc_attr(sprintf( $args['authortitle'], get_bloginfo('name'), $args['separator'], get_author_name( $author_id ) ));
         $href = get_author_feed_link( $author_id );
     } elseif ( is_search() ) {
-        $title = attr(sprintf( $args['searchtitle'], get_bloginfo('name'), $args['separator'], get_search_query() ));
+        $title = esc_attr(sprintf( $args['searchtitle'], get_bloginfo('name'), $args['separator'], get_search_query() ));
         $href = get_search_feed_link();
     }
@@ -1682 +1682 @@
  * Display the contents of the search query variable.
  *
- * The search query string is passed through {@link attr()}
+ * The search query string is passed through {@link esc_attr()}
  * to ensure that it is safe for placing in an html attribute.
  *
@@ -1689 +1689 @@
  */
 function the_search_query() {
-    echo attr( apply_filters( 'the_search_query', get_search_query() ) );
+    echo esc_attr( apply_filters( 'the_search_query', get_search_query() ) );
 }