Changeset 9129

Timestamp:

10/13/2008 02:48:45 AM (16 years ago)

Author:

azaozz

Message:

Fix stripslashes for post metadata, phpDoc updates for media.php, props jacobsantos, fixes #7871

Location:

trunk

Files:

• wp-admin/includes/media.php (modified) (8 diffs)
• wp-includes/post.php (modified) (4 diffs)

trunk/wp-admin/includes/media.php

@@ -681 +681 @@
 }
 
-// produce HTML for the image alignment radio buttons with the specified one checked
-/**
- * {@internal Missing Short Description}}
+/**
+ * Retrieve HTML for the image alignment radio buttons with the specified one checked.
  *
  * @since unknown
@@ -707 +706 @@
 }
 
-// produce HTML for the size radio buttons with the specified one checked
-/**
- * {@internal Missing Short Description}}
+/**
+ * Retrieve HTML for the size radio buttons with the specified one checked.
  *
  * @since unknown
@@ -724 +722 @@
         foreach ( $size_names as $size => $name) {
             $downsize = image_downsize($post->ID, $size);
-            
+
             // is this size selectable?
             $enabled = ( $downsize[3] || 'full' == $size );
@@ -754 +752 @@
 }
 
-// produce HTML for the Link URL buttons with the default link type as specified
-/**
- * {@internal Missing Short Description}}
+/**
+ * Retrieve HTML for the Link URL buttons with the default link type as specified.
  *
  * @since unknown
@@ -961 +958 @@
 
 /**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $post_id
- * @param unknown_type $errors
- * @return unknown
+ * Retrieve HTML for media items of post gallery.
+ *
+ * The HTML markup retrieved will be created for the progress of SWF Upload
+ * component. Will also create link for showing and hiding the form to modify
+ * the image attachment.
+ *
+ * @since unknown
+ *
+ * @param int $post_id Optional. Post ID.
+ * @param array $errors Errors for attachment, if any.
+ * @return string
  */
 function get_media_items( $post_id, $errors ) {
@@ -993 +994 @@
 
 /**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $attachment_id
- * @param unknown_type $args
- * @return unknown
+ * Retrieve HTML form for modifying the image attachment.
+ *
+ * @since unknown
+ *
+ * @param int $attachment_id Attachment ID for modification.
+ * @param string|array $args Optional. Override defaults.
+ * @return string HTML form for attachment.
  */
 function get_media_item( $attachment_id, $args = null ) {
@@ -1804 +1805 @@
 }
 
-// support a GET parameter for disabling the flash uploader
-/**
- * {@internal Missing Short Description}}
+/**
+ * {@internal Missing Short Description}}
+ *
+ * Support a GET parameter for disabling the flash uploader.
  *
  * @since unknown
@@ -1854 +1856 @@
 add_action('post-html-upload-ui', 'media_upload_html_bypass');
 
-// make sure the GET parameter sticks when we submit a form
-/**
- * {@internal Missing Short Description}}
+/**
+ * {@internal Missing Short Description}}
+ *
+ * Make sure the GET parameter sticks when we submit a form.
  *
  * @since unknown

trunk/wp-includes/post.php

@@ -520 +520 @@
     // expected_slashed ($meta_key)
     $meta_key = stripslashes($meta_key);
-    $meta_value = stripslashes($meta_value);
 
     if ( $unique && $wpdb->get_var( $wpdb->prepare( "SELECT meta_key FROM $wpdb->postmeta WHERE meta_key = %s AND post_id = %d", $meta_key, $post_id ) ) )
         return false;
 
-    $meta_value = maybe_serialize($meta_value);
+    $meta_value = maybe_serialize( stripslashes_deep($meta_value) );
 
     $wpdb->insert( $wpdb->postmeta, compact( 'post_id', 'meta_key', 'meta_value' ) );
@@ -546 +545 @@
  *
  * @param int $post_id post ID
- * @param string $key Metadata name.
- * @param mixed $value Optional. Metadata value.
+ * @param string $meta_key Metadata name.
+ * @param mixed $meta_value Optional. Metadata value.
  * @return bool False for failure. True for success.
  */
-function delete_post_meta($post_id, $key, $value = '') {
+function delete_post_meta($post_id, $meta_key, $meta_value = '') {
     global $wpdb;
 
     $post_id = absint( $post_id );
 
-    // expected_slashed ($key, $value)
-    $key = stripslashes( $key );
-    $value = stripslashes( $value );
-
-    if ( empty( $value ) )
-        $meta_id = $wpdb->get_var( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = %s", $post_id, $key ) );
+    // expected_slashed ($meta_key, $meta_value)
+    $meta_key = stripslashes( $meta_key );
+    $meta_value = maybe_serialize( stripslashes_deep($meta_value) );
+
+    if ( empty( $meta_value ) )
+        $meta_id = $wpdb->get_var( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = %s", $post_id, $meta_key ) );
     else
-        $meta_id = $wpdb->get_var( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = %s AND meta_value = %s", $post_id, $key, $value ) );
+        $meta_id = $wpdb->get_var( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = %s AND meta_value = %s", $post_id, $meta_key, $meta_value ) );
 
     if ( !$meta_id )
         return false;
 
-    if ( empty( $value ) )
-        $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = %s", $post_id, $key ) );
+    if ( empty( $meta_value ) )
+        $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = %s", $post_id, $meta_key ) );
     else
-        $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = %s AND meta_value = %s", $post_id, $key, $value ) );
+        $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = %s AND meta_value = %s", $post_id, $meta_key, $meta_value ) );
 
     wp_cache_delete($post_id, 'post_meta');
@@ -633 +632 @@
     // expected_slashed ($meta_key)
     $meta_key = stripslashes($meta_key);
-    $meta_value = stripslashes($meta_value);
 
     if ( ! $wpdb->get_var( $wpdb->prepare( "SELECT meta_key FROM $wpdb->postmeta WHERE meta_key = %s AND post_id = %d", $meta_key, $post_id ) ) ) {
@@ -639 +637 @@
     }
 
-    $meta_value = maybe_serialize($meta_value);
+    $meta_value = maybe_serialize( stripslashes_deep($meta_value) );
 
     $data  = compact( 'meta_value' );