Changeset 3276

Timestamp:

12/07/2005 12:36:07 AM (19 years ago)

Author:

ryan

Message:

Remove calls to html_entity_decode(). fixes #2029

Location:

trunk

Files:

• wp-admin/admin-functions.php (modified) (2 diffs)
• wp-admin/import/blogger.php (modified) (1 diff)
• wp-content/themes/default/functions.php (modified) (2 diffs)
• wp-content/themes/default/images/header-img.php (modified) (1 diff)
• wp-includes/functions-formatting.php (modified) (2 diffs)
• wp-includes/js/tinymce/tiny_mce.js (modified) (1 diff)

trunk/wp-admin/admin-functions.php

@@ -242 +242 @@
 // Get an existing post and format it for editing.
 function get_post_to_edit($id) {
+    global $richedit;
+    $richedit = ( 'true' == get_user_option('rich_editing') ) ? true : false;
+
     $post = get_post($id);
 
-    $post->post_content = format_to_edit($post->post_content);
+    $post->post_content = format_to_edit($post->post_content, $richedit);
     $post->post_content = apply_filters('content_edit_pre', $post->post_content);
 
@@ -300 +303 @@
 
 function get_comment_to_edit($id) {
+    global $richedit;
+    $richedit = ( 'true' == get_user_option('rich_editing') ) ? true : false;
+
     $comment = get_comment($id);
 
-    $comment->comment_content = format_to_edit($comment->comment_content);
+    $comment->comment_content = format_to_edit($comment->comment_content, $richedit);
     $comment->comment_content = apply_filters('comment_edit_pre', $comment->comment_content);
 

trunk/wp-admin/import/blogger.php

@@ -477 +477 @@
                             $commenthour = '00';
                         $comment_date = "$commentyear-$commentmonth-$commentday $commenthour:$commentminute:$commentsecond";
-                        $comment_author = addslashes(strip_tags(html_entity_decode($commentinfo[1])));
+                        $comment_author = addslashes(strip_tags($commentinfo[1]));
                         if ( strpos($commentinfo[1], 'a href') ) {
                             $comment_author_parts = explode('"', htmlentities($commentinfo[1]));

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

@@ -27 +27 @@
 function kubrick_upper_color() {
     if ( strstr( kubrick_header_image_url(), 'header-img.php?' ) )
-        return substr( kubrick_header_image(), 24, 6 );
+        return substr( kubrick_header_image(), 21, 6 );
     else
         return '69aee7';
@@ -34 +34 @@
 function kubrick_lower_color() {
     if ( strstr( kubrick_header_image_url(), 'header-img.php?' ) )
-        return substr( kubrick_header_image(), 37, 6 );
+        return substr( kubrick_header_image(), 34, 6 );
     else
         return '4180b6';

trunk/wp-content/themes/default/images/header-img.php

@@ -13 +13 @@
     if ( isset($_GET[$var]) ) {
         foreach ( $subvars as $index => $subvar ) {
-            $$subvar = hexdec( substr( html_entity_decode($_GET[$var]), $index, 2) );
+            $$subvar = hexdec( substr($_GET[$var], $index, 2) );
             if ( $$subvar < 0 || $$subvar > 255 )
                 $default = true;

trunk/wp-includes/functions-formatting.php

@@ -493 +493 @@
 
 
-function format_to_edit($content) {
+function format_to_edit($content, $richedit = false) {
     $content = apply_filters('format_to_edit', $content);
-    $content = htmlspecialchars($content);
+    if (! $richedit )
+        $content = htmlspecialchars($content);
     return $content;
 }
@@ -998 +999 @@
 
     $output = $text;
-    $output = html_entity_decode($output); // undoes format_to_edit()
     $output = convert_chars($output);
     $output = wpautop($output);

trunk/wp-includes/js/tinymce/tiny_mce.js

@@ -5308 +5308 @@
             // Call custom cleanup code
             value = tinyMCE.storeAwayURLs(value);
-            value = tinyMCE._customCleanup(this, "insert_to_editor", value);
+            //value = tinyMCE._customCleanup(this, "insert_to_editor", value);
             tinyMCE._setHTML(doc, value);
             tinyMCE.setInnerHTML(doc.body, tinyMCE._cleanupHTML(this, doc, tinyMCE.settings, doc.body));