Changeset 8290

Timestamp:

07/08/2008 11:38:53 PM (13 years ago)

Author:

ryan

Message:

Fix quotes in captions. Props azaozz. see #6812

Location:

trunk

Files:

• wp-admin/gears-manifest.php (modified) (2 diffs)
• wp-includes/formatting.php (modified) (1 diff)
• wp-includes/js/tinymce/langs/wp-langs.php (modified) (1 diff)
• wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css (modified) (1 diff)
• wp-includes/js/tinymce/plugins/wpeditimage/editimage.html (modified) (2 diffs)
• wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js (modified) (4 diffs)
• wp-includes/js/tinymce/tiny_mce_config.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/gears-manifest.php

@@ -146 +146 @@
 { "url" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm?ver=311" },
 { "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=311" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311b" },
 { "url" : "../wp-includes/js/tinymce/wp-mce-help.php?ver=311" },
 
@@ -159 +159 @@
 { "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=311" },
 { "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=311" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=311" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=311b" },
 { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css?ver=311" },
 { "url" : "../wp-includes/js/tinymce/wordpress.css?ver=311" },

trunk/wp-includes/formatting.php

@@ -1125 +1125 @@
     if ( empty($text) ) return apply_filters('richedit_pre', '');
 
-    $output = $text;
-    $output = convert_chars($output);
+    $output = convert_chars($text);
     $output = wpautop($output);
-
-    // These must be double-escaped or planets will collide.
-    $output = str_replace('<', '<', $output);
-    $output = str_replace('>', '>', $output);
-
-    // These should be entities too
-    $output = str_replace('<', '&lt;', $output);
-    $output = str_replace('>', '&gt;', $output);
-    
+    $output = htmlspecialchars($output, ENT_NOQUOTES);
+
     return apply_filters('richedit_pre', $output);
 }

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

@@ -435 +435 @@
 s120:"' . mce_escape( __('120%') ) . '",
 s130:"' . mce_escape( __('130%') ) . '",
-caption:"' . mce_escape( __('Caption') ) . '"
+img_title:"' . mce_escape( __('Edit Image Title') ) . '",
+caption:"' . mce_escape( __('Edit Image Caption') ) . '"
 });
 ';

trunk/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css

@@ -63 +63 @@
 }
 
+#media-upload #basic th.label {
+    padding: 5px 5px 5px 0;
+}
+
 .show-align {
     height: 200px;

trunk/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html

@@ -8 +8 @@
 <script type="text/javascript" src="../../utils/form_utils.js?ver=311"></script>
 
-<link rel="stylesheet" href="css/editimage.css?ver=311" type="text/css" media="all" />
+<link rel="stylesheet" href="css/editimage.css?ver=311b" type="text/css" media="all" />
 <link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=2.6-beta1" type="text/css" media="all" />
 <script type="text/javascript">
@@ -78 +78 @@
             <th valign="top" scope="row" class="label">
                 <label for="img_title">
-                <span class="alignleft">{#advanced_dlg.link_titlefield}</span>
-                <span class="alignright"><abbr title="required" class="required">*</abbr></span>
+                <span class="alignleft">{#wpeditimage.img_title}</span>
                 </label>
             </th>

trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js

@@ -16 +16 @@
                     return;
 
-                tb_show('', url + '/editimage.html?TB_iframe=true');
+                tb_show('', url + '/editimage.html?ver=311b&TB_iframe=true');
                 tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
             });
@@ -75 +75 @@
         _do_shcode : function(co) {
             return co.replace(/\[wp_caption([^\]]+)\]([\s\S]+?)\[\/wp_caption\][\s\u00a0]*/g, function(a,b,c){
+                b = b.replace(/\\'|\\'|\\'/g, ''').replace(/\\"|\\"/g, '"');
+                c = c.replace(/\\'|\\'/g, ''').replace(/\\"/g, '"');
                 var id = b.match(/id=['"]([^'"]+)/i), cls = b.match(/align=['"]([^'"]+)/i);
                 var w = b.match(/width=['"]([0-9]+)/), cap = b.match(/caption=['"]([^'"]+)/i);
@@ -92 +94 @@
 
         _get_shcode : function(co) {
-            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){
+            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){
                 var id = b.match(/id=['"]([^'"]+)/i), cls = b.match(/class=['"]([^'"]+)/i);
                 var w = c.match(/width=['"]([0-9]+)/);
@@ -102 +104 @@
                 if ( ! w || ! cap ) return c;
                 cls = cls.match(/align[^ '"]+/) || 'alignnone';
+                cap = cap.replace(/<\S[^<>]*>/gi, '').replace(/'/g, '&#39;').replace(/"/g, '&quot;');
 
                 return '[wp_caption id="'+id+'" align="'+cls+'" width="'+w+'" caption="'+cap+'"]'+c+'[/wp_caption]';

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

@@ -223 +223 @@
 if ( $disk_cache ) {
 
-    $cacheKey = apply_filters('tiny_mce_version', '20080706');
+    $cacheKey = apply_filters('tiny_mce_version', '20080708');
 
     foreach ( $initArray as $v )

trunk/wp-includes/script-loader.php

@@ -38 +38 @@
 
     // Modify this version when tinyMCE plugins are changed.
-    $mce_version = apply_filters('tiny_mce_version', '20080706');
+    $mce_version = apply_filters('tiny_mce_version', '20080708');
     $scripts->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('editor_functions'), $mce_version );