WordPress.org

Make WordPress Core

Changeset 8290


Ignore:
Timestamp:
07/08/2008 11:38:53 PM (10 years ago)
Author:
ryan
Message:

Fix quotes in captions. Props azaozz. see #6812

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/gears-manifest.php

    r8256 r8290  
    146146{ "url" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm?ver=311" },
    147147{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=311" },
    148 { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311" },
     148{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311b" },
    149149{ "url" : "../wp-includes/js/tinymce/wp-mce-help.php?ver=311" },
    150150
     
    159159{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=311" },
    160160{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=311" },
    161 { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=311" },
     161{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=311b" },
    162162{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css?ver=311" },
    163163{ "url" : "../wp-includes/js/tinymce/wordpress.css?ver=311" },
  • trunk/wp-includes/formatting.php

    r8073 r8290  
    11251125    if ( empty($text) ) return apply_filters('richedit_pre', '');
    11261126
    1127     $output = $text;
    1128     $output = convert_chars($output);
     1127    $output = convert_chars($text);
    11291128    $output = wpautop($output);
    1130 
    1131     // These must be double-escaped or planets will collide.
    1132     $output = str_replace('<', '<', $output);
    1133     $output = str_replace('>', '>', $output);
    1134 
    1135     // These should be entities too
    1136     $output = str_replace('<', '&lt;', $output);
    1137     $output = str_replace('>', '&gt;', $output);
    1138    
     1129    $output = htmlspecialchars($output, ENT_NOQUOTES);
     1130
    11391131    return apply_filters('richedit_pre', $output);
    11401132}
  • trunk/wp-includes/js/tinymce/langs/wp-langs.php

    r8248 r8290  
    435435s120:"' . mce_escape( __('120%') ) . '",
    436436s130:"' . mce_escape( __('130%') ) . '",
    437 caption:"' . mce_escape( __('Caption') ) . '"
     437img_title:"' . mce_escape( __('Edit Image Title') ) . '",
     438caption:"' . mce_escape( __('Edit Image Caption') ) . '"
    438439});
    439440';
  • trunk/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css

    r8167 r8290  
    6363}
    6464
     65#media-upload #basic th.label {
     66    padding: 5px 5px 5px 0;
     67}
     68
    6569.show-align {
    6670    height: 200px;
  • trunk/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html

    r8204 r8290  
    88<script type="text/javascript" src="../../utils/form_utils.js?ver=311"></script>
    99
    10 <link rel="stylesheet" href="css/editimage.css?ver=311" type="text/css" media="all" />
     10<link rel="stylesheet" href="css/editimage.css?ver=311b" type="text/css" media="all" />
    1111<link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=2.6-beta1" type="text/css" media="all" />
    1212<script type="text/javascript">
     
    7878            <th valign="top" scope="row" class="label">
    7979                <label for="img_title">
    80                 <span class="alignleft">{#advanced_dlg.link_titlefield}</span>
    81                 <span class="alignright"><abbr title="required" class="required">*</abbr></span>
     80                <span class="alignleft">{#wpeditimage.img_title}</span>
    8281                </label>
    8382            </th>
  • trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js

    r8260 r8290  
    1616                    return;
    1717
    18                 tb_show('', url + '/editimage.html?TB_iframe=true');
     18                tb_show('', url + '/editimage.html?ver=311b&TB_iframe=true');
    1919                tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
    2020            });
     
    7575        _do_shcode : function(co) {
    7676            return co.replace(/\[wp_caption([^\]]+)\]([\s\S]+?)\[\/wp_caption\][\s\u00a0]*/g, function(a,b,c){
     77                b = b.replace(/\\'|\\&#39;|\\&#039;/g, '&#39;').replace(/\\"|\\&quot;/g, '&quot;');
     78                c = c.replace(/\\&#39;|\\&#039;/g, '&#39;').replace(/\\&quot;/g, '&quot;');
    7779                var id = b.match(/id=['"]([^'"]+)/i), cls = b.match(/align=['"]([^'"]+)/i);
    7880                var w = b.match(/width=['"]([0-9]+)/), cap = b.match(/caption=['"]([^'"]+)/i);
     
    9294
    9395        _get_shcode : function(co) {
    94             return co.replace(/<div class="mceTemp[^"]*">\s*<dl([^>]+)>\s*<dt[^>]+>([\s\S]+?)<\/dt>\s*<dd[^>]+>([^<]+)<\/dd>\s*<\/dl>\s*<\/div>\s*/gi, function(a,b,c,cap){
     96            return co.replace(/<div class="mceTemp[^"]*">\s*<dl([^>]+)>\s*<dt[^>]+>([\s\S]+?)<\/dt>\s*<dd[^>]+>(.+?)<\/dd>\s*<\/dl>\s*<\/div>\s*/gi, function(a,b,c,cap){
    9597                var id = b.match(/id=['"]([^'"]+)/i), cls = b.match(/class=['"]([^'"]+)/i);
    9698                var w = c.match(/width=['"]([0-9]+)/);
     
    102104                if ( ! w || ! cap ) return c;
    103105                cls = cls.match(/align[^ '"]+/) || 'alignnone';
     106                cap = cap.replace(/<\S[^<>]*>/gi, '').replace(/'/g, '&#39;').replace(/"/g, '&quot;');
    104107
    105108                return '[wp_caption id="'+id+'" align="'+cls+'" width="'+w+'" caption="'+cap+'"]'+c+'[/wp_caption]';
  • trunk/wp-includes/js/tinymce/tiny_mce_config.php

    r8260 r8290  
    223223if ( $disk_cache ) {
    224224
    225     $cacheKey = apply_filters('tiny_mce_version', '20080706');
     225    $cacheKey = apply_filters('tiny_mce_version', '20080708');
    226226
    227227    foreach ( $initArray as $v )
  • trunk/wp-includes/script-loader.php

    r8262 r8290  
    3838
    3939    // Modify this version when tinyMCE plugins are changed.
    40     $mce_version = apply_filters('tiny_mce_version', '20080706');
     40    $mce_version = apply_filters('tiny_mce_version', '20080708');
    4141    $scripts->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('editor_functions'), $mce_version );
    4242
Note: See TracChangeset for help on using the changeset viewer.