Changeset 23554 for trunk/wp-admin/includes/media.php

Timestamp:

03/01/2013 04:28:40 PM (12 years ago)

Author:

ryan

Message:

Revert 23416, 23419, 23445 except for wp_reset_vars() changes. We are going a different direction with the slashing cleanup, so resetting to a clean slate. see #21767

File:

• trunk/wp-admin/includes/media.php (modified) (5 diffs)

trunk/wp-admin/includes/media.php

@@ -445 +445 @@
 
     if ( !empty($_POST['attachments']) ) foreach ( $_POST['attachments'] as $attachment_id => $attachment ) {
-        $attachment = wp_unslash( $attachment );
-    
         $post = $_post = get_post($attachment_id, ARRAY_A);
         $post_type_object = get_post_type_object( $post[ 'post_type' ] );
@@ -471 +469 @@
         if ( isset($attachment['image_alt']) ) {
             $image_alt = get_post_meta($attachment_id, '_wp_attachment_image_alt', true);
-            if ( $image_alt != $attachment['image_alt'] ) {
-                $image_alt = wp_strip_all_tags( $attachment['image_alt'], true );
-                wp_update_post_meta( $attachment_id, '_wp_attachment_image_alt', $image_alt );
+            if ( $image_alt != stripslashes($attachment['image_alt']) ) {
+                $image_alt = wp_strip_all_tags( stripslashes($attachment['image_alt']), true );
+                // update_meta expects slashed
+                update_post_meta( $attachment_id, '_wp_attachment_image_alt', addslashes($image_alt) );
             }
         }
@@ -503 +502 @@
 
     if ( isset($send_id) ) {
-        $attachment = wp_unslash( $_POST['attachments'][$send_id] );
+        $attachment = stripslashes_deep( $_POST['attachments'][$send_id] );
 
         $html = isset( $attachment['post_title'] ) ? $attachment['post_title'] : '';
@@ -548 +547 @@
 
         if ( isset( $_POST['media_type'] ) && 'image' != $_POST['media_type'] ) {
-            $title = esc_html( wp_unslash( $_POST['title'] ) );
+            $title = esc_html( stripslashes( $_POST['title'] ) );
             if ( empty( $title ) )
                 $title = esc_html( basename( $src ) );
@@ -563 +562 @@
         } else {
             $align = '';
-            $alt = esc_attr( wp_unslash( $_POST['alt'] ) );
+            $alt = esc_attr( stripslashes( $_POST['alt'] ) );
             if ( isset($_POST['align']) ) {
-                $align = esc_attr( wp_unslash( $_POST['align'] ) );
+                $align = esc_attr( stripslashes( $_POST['align'] ) );
                 $class = " class='align$align'";
             }