Changeset 11103

Timestamp:

04/27/2009 09:58:04 PM (15 years ago)

Author:

ryan

Message:

attr(), _a(), _ea(), _xa() for shorthand attribute escaping. see #9650

Location:

trunk

Files:

• wp-admin/categories.php (modified) (4 diffs)
• wp-includes/formatting.php (modified) (1 diff)
• wp-includes/l10n.php (modified) (3 diffs)

trunk/wp-admin/categories.php

@@ -145 +145 @@
     <label class="hidden" for="category-search-input"><?php _e('Search Categories'); ?>:</label>
     <input type="text" id="category-search-input" name="s" value="<?php _admin_search_query(); ?>" />
-    <input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" />
+    <input type="submit" value="<?php _ea( 'Search Categories' ); ?>" class="button" />
 </p>
 </form>
@@ -185 +185 @@
 <option value="delete"><?php _e('Delete'); ?></option>
 </select>
-<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
+<input type="submit" value="<?php _ea('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
 <?php wp_nonce_field('bulk-categories'); ?>
 </div>
@@ -225 +225 @@
 <option value="delete"><?php _e('Delete'); ?></option>
 </select>
-<input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
+<input type="submit" value="<?php _ea('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
 <?php wp_nonce_field('bulk-categories'); ?>
 </div>
@@ -279 +279 @@
 </div>
 
-<p class="submit"><input type="submit" class="button" name="submit" value="<?php _e('Add Category'); ?>" /></p>
+<p class="submit"><input type="submit" class="button" name="submit" value="<?php _ea('Add Category'); ?>" /></p>
 <?php do_action('edit_category_form', $category); ?>
 </form></div>

trunk/wp-includes/formatting.php

@@ -2074 +2074 @@
  * Escaping for HTML attributes.
  *
- * @since 2.0.6
+ * @since 2.8.0
  *
  * @param string $text
  * @return string
  */
-function attribute_escape( $text ) {
+function attr( $text ) {
     $safe_text = wp_check_invalid_utf8( $text );
     $safe_text = wp_specialchars( $safe_text, ENT_QUOTES );
     return apply_filters( 'attribute_escape', $safe_text, $text );
+}
+
+/**
+ * Escaping for HTML attributes.
+ *
+ * @since 2.0.6
+ *
+ * @deprecated 2.8.0
+ * @see attr()
+ * 
+ * @param string $text
+ * @return string
+ */
+function attribute_escape( $text ) {
+    return attr( $text );
 }
 

trunk/wp-includes/l10n.php

@@ -107 +107 @@
 
 /**
+ * Retrieves the translation of $text and escapes it for safe use in an attribute.
+ * If there is no translation, or the domain isn't loaded the original text is returned.
+ *
+ * @see translate() An alias of translate()
+ * @see attr()
+ * @since 2.8.0
+ *
+ * @param string $text Text to translate
+ * @param string $domain Optional. Domain to retrieve the translated text
+ * @return string Translated text
+ */
+function _a( $text, $domain = 'default' ) {
+    return attr( translate( $text, $domain ) );
+}
+
+/**
  * Displays the returned translated text from translate().
  *
@@ -117 +133 @@
 function _e( $text, $domain = 'default' ) {
     echo translate( $text, $domain );
+}
+
+/**
+ * Displays translated text that has been escaped for safe use in an attribute.
+ *
+ * @see translate() Echos returned translate() string
+ * @see attr()
+ * @since 2.8.0
+ *
+ * @param string $text Text to translate
+ * @param string $domain Optional. Domain to retrieve the translated text
+ */
+function _ea( $text, $domain = 'default' ) {
+    echo attr( translate( $text, $domain ) );
 }
 
@@ -144 +174 @@
 function _x( $single, $context, $domain = 'default' ) {
     return translate_with_gettext_context( $single, $context, $domain );
+}
+
+function _xa( $single, $context, $domain = 'default' ) {
+    return attr( translate_with_gettext_context( $single, $context, $domain ) );
 }