Changeset 11245

Timestamp:

05/09/2009 07:27:22 AM (16 years ago)

Author:

markjaquith

Message:

esc_js(). Shorter, follows new escaping naming convention.

Location:

trunk

Files:

• wp-admin/edit-attachment-rows.php (modified) (1 diff)
• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-admin/edit-form-comment.php (modified) (1 diff)
• wp-admin/edit-link-form.php (modified) (1 diff)
• wp-admin/edit-page-form.php (modified) (1 diff)
• wp-admin/import/blogger.php (modified) (3 diffs)
• wp-admin/includes/template.php (modified) (2 diffs)
• wp-admin/link-manager.php (modified) (1 diff)
• wp-admin/press-this.php (modified) (1 diff)
• wp-admin/themes.php (modified) (1 diff)
• wp-admin/update-core.php (modified) (1 diff)
• wp-admin/upload.php (modified) (1 diff)
• wp-content/themes/default/functions.php (modified) (1 diff)
• wp-includes/bookmark.php (modified) (1 diff)
• wp-includes/class.wp-scripts.php (modified) (1 diff)
• wp-includes/formatting.php (modified) (2 diffs)
• wp-includes/js/tinymce/langs/wp-langs.php (modified) (1 diff)
• wp-includes/post.php (modified) (1 diff)
• wp-includes/taxonomy.php (modified) (1 diff)

trunk/wp-admin/edit-attachment-rows.php

@@ -83 +83 @@
             $actions['edit'] = '<a href="' . get_edit_post_link($post->ID, true) . '">' . __('Edit') . '</a>';
         if ( current_user_can('delete_post', $post->ID) )
-            $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this attachment '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this attachment '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
+            $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID) . "' onclick=\"if ( confirm('" . esc_js(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this attachment '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this attachment '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
         $actions['view'] = '<a href="' . get_permalink($post->ID) . '" title="' . esc_attr(sprintf(__('View &#8220;%s&#8221;'), $title)) . '" rel="permalink">' . __('View') . '</a>';
         $action_count = count($actions);

trunk/wp-admin/edit-form-advanced.php

@@ -230 +230 @@
 <?php
 if ( ( 'edit' == $action ) && current_user_can('delete_post', $post->ID) ) { ?>
-<a class="submitdelete deletion" href="<?php echo wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID); ?>" onclick="if ( confirm('<?php echo js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a>
+<a class="submitdelete deletion" href="<?php echo wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID); ?>" onclick="if ( confirm('<?php echo esc_js(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a>
 <?php } ?>
 </div>

trunk/wp-admin/edit-form-comment.php

@@ -70 +70 @@
 <div id="major-publishing-actions">
 <div id="delete-action">
-<?php echo "<a class='submitdelete deletion' href='" . wp_nonce_url("comment.php?action=deletecomment&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . urlencode(wp_get_referer()), 'delete-comment_' . $comment->comment_ID) . "' onclick=\"if ( confirm('" . js_escape(__("You are about to delete this comment. \n  'Cancel' to stop, 'OK' to delete.")) . "') ){return true;}return false;\">" . __('Delete') . "</a>\n"; ?>
+<?php echo "<a class='submitdelete deletion' href='" . wp_nonce_url("comment.php?action=deletecomment&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . urlencode(wp_get_referer()), 'delete-comment_' . $comment->comment_ID) . "' onclick=\"if ( confirm('" . esc_js(__("You are about to delete this comment. \n  'Cancel' to stop, 'OK' to delete.")) . "') ){return true;}return false;\">" . __('Delete') . "</a>\n"; ?>
 </div>
 <div id="publishing-action">

trunk/wp-admin/edit-link-form.php

@@ -86 +86 @@
 <?php
 if ( !empty($_GET['action']) && 'edit' == $_GET['action'] && current_user_can('manage_links') ) { ?>
-    <a class="submitdelete deletion" href="<?php echo wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id); ?>" onclick="if ( confirm('<?php echo js_escape(sprintf(__("You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete."), $link->link_name )); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a>
+    <a class="submitdelete deletion" href="<?php echo wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id); ?>" onclick="if ( confirm('<?php echo esc_js(sprintf(__("You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete."), $link->link_name )); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a>
 <?php } ?>
 </div>

trunk/wp-admin/edit-page-form.php

@@ -217 +217 @@
 <?php
 if ( ( 'edit' == $action ) && current_user_can('delete_page', $post->ID) ) { ?>
-<a class="submitdelete deletion" href="<?php echo wp_nonce_url("page.php?action=delete&amp;post=$post->ID", 'delete-page_' . $post->ID); ?>" onclick="if ( confirm('<?php echo js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this page '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a>
+<a class="submitdelete deletion" href="<?php echo wp_nonce_url("page.php?action=delete&amp;post=$post->ID", 'delete-page_' . $post->ID); ?>" onclick="if ( confirm('<?php echo esc_js(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this page '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a>
 <?php } ?>
 </div>

trunk/wp-admin/import/blogger.php

@@ -191 +191 @@
         }
 //echo '<pre>'.print_r($this,1).'</pre>';
-        $start    = js_escape( __('Import') );
-        $continue = js_escape( __('Continue') );
-        $stop     = js_escape( __('Importing...') );
-        $authors  = js_escape( __('Set Authors') );
-        $loadauth = js_escape( __('Preparing author mapping form...') );
-        $authhead = js_escape( __('Final Step: Author Mapping') );
-        $nothing  = js_escape( __('Nothing was imported. Had you already imported this blog?') );
+        $start    = esc_js( __('Import') );
+        $continue = esc_js( __('Continue') );
+        $stop     = esc_js( __('Importing...') );
+        $authors  = esc_js( __('Set Authors') );
+        $loadauth = esc_js( __('Preparing author mapping form...') );
+        $authhead = esc_js( __('Final Step: Author Mapping') );
+        $nothing  = esc_js( __('Nothing was imported. Had you already imported this blog?') );
         $title    = __('Blogger Blogs');
         $name     = __('Blog Name');
@@ -216 +216 @@
                 $value = $authors;
             $value = esc_attr($value);
-            $blogtitle = js_escape( $blog['title'] );
+            $blogtitle = esc_js( $blog['title'] );
             $pdone = isset($blog['posts_done']) ? (int) $blog['posts_done'] : 0;
             $cdone = isset($blog['comments_done']) ? (int) $blog['comments_done'] : 0;
@@ -659 +659 @@
         $mapthis = __('Blogger username');
         $tothis = __('WordPress login');
-        $submit = js_escape( __('Save Changes') );
+        $submit = esc_js( __('Save Changes') );
 
         foreach ( $blog['authors'] as $i => $author )

trunk/wp-admin/includes/template.php

@@ -1447 +1447 @@
                 $actions['edit'] = '<a href="' . get_edit_post_link($post->ID, true) . '" title="' . esc_attr(__('Edit this post')) . '">' . __('Edit') . '</a>';
                 $actions['inline hide-if-no-js'] = '<a href="#" class="editinline" title="' . esc_attr(__('Edit this post inline')) . '">' . __('Quick&nbsp;Edit') . '</a>';
-                $actions['delete'] = "<a class='submitdelete' title='" . esc_attr(__('Delete this post')) . "' href='" . wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
+                $actions['delete'] = "<a class='submitdelete' title='" . esc_attr(__('Delete this post')) . "' href='" . wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID) . "' onclick=\"if ( confirm('" . esc_js(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
             }
             if ( in_array($post->post_status, array('pending', 'draft')) ) {
@@ -1660 +1660 @@
             $actions['edit'] = '<a href="' . $edit_link . '" title="' . esc_attr(__('Edit this page')) . '">' . __('Edit') . '</a>';
             $actions['inline'] = '<a href="#" class="editinline">' . __('Quick&nbsp;Edit') . '</a>';
-            $actions['delete'] = "<a class='submitdelete' title='" . esc_attr(__('Delete this page')) . "' href='" . wp_nonce_url("page.php?action=delete&amp;post=$page->ID", 'delete-page_' . $page->ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $page->post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this page '%s'\n 'Cancel' to stop, 'OK' to delete."), $page->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
+            $actions['delete'] = "<a class='submitdelete' title='" . esc_attr(__('Delete this page')) . "' href='" . wp_nonce_url("page.php?action=delete&amp;post=$page->ID", 'delete-page_' . $page->ID) . "' onclick=\"if ( confirm('" . esc_js(sprintf( ('draft' == $page->post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this page '%s'\n 'Cancel' to stop, 'OK' to delete."), $page->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
         }
         if ( in_array($post->post_status, array('pending', 'draft')) ) {

trunk/wp-admin/link-manager.php

@@ -198 +198 @@
                     $actions = array();
                     $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
-                    $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id) . "' onclick=\"if ( confirm('" . js_escape(sprintf( __("You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete."), $link->link_name )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
+                    $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id) . "' onclick=\"if ( confirm('" . esc_js(sprintf( __("You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete."), $link->link_name )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
                     $action_count = count($actions);
                     $i = 0;

trunk/wp-admin/press-this.php

@@ -403 +403 @@
                 break;
             case 'photo' :
-                jQuery('#extra_fields').before('<p id="waiting"><img src="images/wpspin_light.gif" alt="" /> <?php echo js_escape( __( 'Loading...' ) ); ?></p>');
+                jQuery('#extra_fields').before('<p id="waiting"><img src="images/wpspin_light.gif" alt="" /> <?php echo esc_js( __( 'Loading...' ) ); ?></p>');
                 jQuery.ajax({
                     type: "GET",

trunk/wp-admin/themes.php

@@ -198 +198 @@
     $actions[] = '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $theme_name)) . '">' . __('Preview') . '</a>';
     if ( current_user_can('update_themes') )
-        $actions[] = '<a class="submitdelete deletion" href="' . wp_nonce_url("themes.php?action=delete&amp;template=$stylesheet", 'delete-theme_' . $stylesheet) . '" onclick="' . "if ( confirm('" . js_escape(sprintf( __("You are about to delete this theme '%s'\n  'Cancel' to stop, 'OK' to delete."), $theme_name )) . "') ) {return true;}return false;" . '">' . __('Delete') . '</a>';
+        $actions[] = '<a class="submitdelete deletion" href="' . wp_nonce_url("themes.php?action=delete&amp;template=$stylesheet", 'delete-theme_' . $stylesheet) . '" onclick="' . "if ( confirm('" . esc_js(sprintf( __("You are about to delete this theme '%s'\n  'Cancel' to stop, 'OK' to delete."), $theme_name )) . "') ) {return true;}return false;" . '">' . __('Delete') . '</a>';
     $actions = apply_filters('theme_action_links', $actions, $themes[$theme_name]);
 

trunk/wp-admin/update-core.php

@@ -59 +59 @@
     if ( $dismissed ) {
 
-        $show_text = js_escape(__('Show hidden updates'));
-        $hide_text = js_escape(__('Hide hidden updates'));
+        $show_text = esc_js(__('Show hidden updates'));
+        $hide_text = esc_js(__('Hide hidden updates'));
     ?>
     <script type="text/javascript">

trunk/wp-admin/upload.php

@@ -342 +342 @@
             $actions['edit'] = '<a href="' . get_edit_post_link($post->ID, true) . '">' . __('Edit') . '</a>';
         if ( current_user_can('delete_post', $post->ID) )
-            $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this attachment '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this attachment '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
+            $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID) . "' onclick=\"if ( confirm('" . esc_js(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this attachment '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this attachment '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
         $actions['view'] = '<a href="' . get_permalink($post->ID) . '" title="' . esc_attr(sprintf(__('View &#8220;%s&#8221;'), $title)) . '" rel="permalink">' . __('View') . '</a>';
         if ( current_user_can('edit_post', $post->ID) )

trunk/wp-content/themes/default/functions.php

@@ -252 +252 @@
     }
     function kRevert() {
-        document.getElementById('headerimage').value = '<?php echo js_escape(kubrick_header_image()); ?>';
-        document.getElementById('advuppercolor').value = document.getElementById('uppercolor').value = '#<?php echo js_escape(kubrick_upper_color()); ?>';
-        document.getElementById('advlowercolor').value = document.getElementById('lowercolor').value = '#<?php echo js_escape(kubrick_lower_color()); ?>';
-        document.getElementById('header').style.background = 'url("<?php echo js_escape(kubrick_header_image_url()); ?>") center no-repeat';
+        document.getElementById('headerimage').value = '<?php echo esc_js(kubrick_header_image()); ?>';
+        document.getElementById('advuppercolor').value = document.getElementById('uppercolor').value = '#<?php echo esc_js(kubrick_upper_color()); ?>';
+        document.getElementById('advlowercolor').value = document.getElementById('lowercolor').value = '#<?php echo esc_js(kubrick_lower_color()); ?>';
+        document.getElementById('header').style.background = 'url("<?php echo esc_js(kubrick_header_image_url()); ?>") center no-repeat';
         document.getElementById('header').style.color = '';
-        document.getElementById('advfontcolor').value = document.getElementById('fontcolor').value = '<?php echo js_escape(kubrick_header_color_string()); ?>';
-        document.getElementById('fontdisplay').value = '<?php echo js_escape(kubrick_header_display_string()); ?>';
+        document.getElementById('advfontcolor').value = document.getElementById('fontcolor').value = '<?php echo esc_js(kubrick_header_color_string()); ?>';
+        document.getElementById('fontdisplay').value = '<?php echo esc_js(kubrick_header_display_string()); ?>';
         document.getElementById('headerimg').style.display = document.getElementById('fontdisplay').value;
     }

trunk/wp-includes/bookmark.php

@@ -358 +358 @@
         $value = esc_attr($value);
     else if ( 'js' == $context )
-        $value = js_escape($value);
+        $value = esc_js($value);
 
     return $value;

trunk/wp-includes/class.wp-scripts.php

@@ -61 +61 @@
                 continue;
             }
-            $data .= "$eol\t$var: \"" . js_escape( $val ) . '"';
+            $data .= "$eol\t$var: \"" . esc_js( $val ) . '"';
             $eol = ",\n";
         }

trunk/wp-includes/formatting.php

@@ -2055 +2055 @@
  * The filter 'js_escape' is also applied here.
  *
- * @since 2.0.4
+ * @since 2.8.0
  *
  * @param string $text The text to be escaped.
  * @return string Escaped text.
  */
-function js_escape($text) {
+function esc_js( $text ) {
     $safe_text = wp_check_invalid_utf8( $text );
     $safe_text = wp_specialchars( $safe_text, ENT_COMPAT );
@@ -2066 +2066 @@
     $safe_text = preg_replace( "/\r?\n/", "\\n", addslashes( $safe_text ) );
     return apply_filters( 'js_escape', $safe_text, $text );
+}
+
+/**
+ * Escape single quotes, specialchar double quotes, and fix line endings.
+ *
+ * The filter 'js_escape' is also applied by esc_js()
+ *
+ * @since 2.0.4
+ *
+ * @deprecated 2.8.0
+ * @see esc_js()
+ *
+ * @param string $text The text to be escaped.
+ * @return string Escaped text.
+ */
+function js_escape( $text ) {
+    return esc_js( $text );
 }
 

trunk/wp-includes/js/tinymce/langs/wp-langs.php

@@ -19 +19 @@
 
     if ( 'en' == $language ) return $text;
-    else return js_escape($text);
+    else return esc_js($text);
 }
 

trunk/wp-includes/post.php

@@ -906 +906 @@
         $value = esc_attr($value);
     else if ( 'js' == $context )
-        $value = js_escape($value);
+        $value = esc_js($value);
 
     return $value;

trunk/wp-includes/taxonomy.php

@@ -1014 +1014 @@
         $value = esc_attr($value);
     else if ( 'js' == $context )
-        $value = js_escape($value);
+        $value = esc_js($value);
 
     return $value;