WordPress.org

Make WordPress Core

Changeset 19659


Ignore:
Timestamp:
01/03/2012 06:29:02 PM (9 years ago)
Author:
ryan
Message:

Remove esc_js() as this content now gets json encoded rather than a straight echo. props ocean90. fixes #19644, for 3.3

Location:
branches/3.3
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/3.3

  • branches/3.3/wp-admin/includes/template.php

    r19574 r19659  
    17621762
    17631763    public static function pointer_wp330_toolbar() {
    1764         $content  = '<h3>' . esc_js( __( 'New Feature: Toolbar' ) ). '</h3>';
    1765         $content .= '<p>' . esc_js( __( 'We&#8217;ve combined the admin bar and the old Dashboard header into one persistent toolbar. Hover over the toolbar items to see what&#8217;s new.' ) ) . '</p>';
     1764        $content  = '<h3>' . __( 'New Feature: Toolbar' ) . '</h3>';
     1765        $content .= '<p>' .  __( 'We&#8217;ve combined the admin bar and the old Dashboard header into one persistent toolbar. Hover over the toolbar items to see what&#8217;s new.' ) . '</p>';
    17661766
    17671767        if ( is_multisite() && is_super_admin() )
    1768             $content .= '<p>' .esc_js( __( 'Network Admin is now located in the My Sites menu.' ) ) . '</p>';
     1768            $content .= '<p>' . __( 'Network Admin is now located in the My Sites menu.' ) . '</p>';
    17691769
    17701770        WP_Internal_Pointers::print_js( 'wp330_toolbar', '#wpadminbar', array(
     
    17801780     */
    17811781    public static function pointer_wp330_media_uploader() {
    1782         $content  = '<h3>' . esc_js( __( 'Updated Media Uploader' ) ) . '</h3>';
    1783         $content .= '<p>' . esc_js( __( 'The single media icon now launches the uploader for all file types, and the new drag and drop interface makes uploading a breeze.' ) ) . '</p>';
     1782        $content  = '<h3>' . __( 'Updated Media Uploader' ) . '</h3>';
     1783        $content .= '<p>' . __( 'The single media icon now launches the uploader for all file types, and the new drag and drop interface makes uploading a breeze.' ) . '</p>';
    17841784
    17851785        WP_Internal_Pointers::print_js( 'wp330_media_uploader', '#content-add_media', array(
     
    17951795     */
    17961796    public static function pointer_wp330_saving_widgets() {
    1797         $content  = '<h3>' . esc_js( __( 'New Feature: Saving Widgets' ) ) . '</h3>';
    1798         $content .= '<p>' . esc_js( __( 'If you change your mind and revert to your previous theme, we&#8217;ll put the widgets back the way you had them.' ) ) . '</p>';
     1797        $content  = '<h3>' . __( 'New Feature: Saving Widgets' ) . '</h3>';
     1798        $content .= '<p>' . __( 'If you change your mind and revert to your previous theme, we&#8217;ll put the widgets back the way you had them.' ). '</p>';
    17991799
    18001800        WP_Internal_Pointers::print_js( 'wp330_saving_widgets', '#message2', array(
  • branches/3.3/wp-includes/capabilities.php

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.