Changeset 10957

Timestamp:

04/16/2009 09:55:35 PM (18 years ago)

Author:

azaozz

Message:

Show proper error when adding a custom field without a value, props scohoust, fixes #7541

Location:

trunk/wp-admin

Files:

• admin-ajax.php (modified) (3 diffs)
• includes/post.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -771 +771 @@
                 if ( !current_user_can( 'edit_post', $pid ) )
                         die('-1');
-                if ( '#NONE#' == $_POST['metakeyselect'] && empty($_POST['metakeyinput']) )
+                if ( isset($_POST['metakeyselect']) && '#NONE#' == $_POST['metakeyselect'] && empty($_POST['metakeyinput']) )
                         die('1');
                 if ( $pid < 0 ) {
@@ -785 +785 @@
                                         $x->send();
                                 }
-                                $mid = add_meta( $pid );
+                                if ( !$mid = add_meta( $pid ) ) 
+                                        die(__('Please provide a custom field value.'));
                         } else {
                                 die('0');
                         }
                 } else if ( !$mid = add_meta( $pid ) ) {
-                        die('0');
+                        die(__('Please provide a custom field value.'));
                 }
 
@@ -812 +813 @@
                         die('-1');
                 if ( !$u = update_meta( $mid, $key, $value ) )
-                        die('1'); // We know meta exists; we also know it's unchanged (or DB error, in which case there are bigger problems).
+                        die('0'); // We know meta exists; we also know it's unchanged (or DB error, in which case there are bigger problems).
+        
                 $key = stripslashes($key);
                 $value = stripslashes($value);

trunk/wp-admin/includes/post.php

@@ -678 +678 @@
                 return false;
 
+        if ( '' === trim( $meta_value ) )
+                return false;
+
         $post_id = $wpdb->get_var( $wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE meta_id = %d", $meta_id) );
         wp_cache_delete($post_id, 'post_meta');
 
-        $meta_value = maybe_serialize( stripslashes( $meta_value ));
+        $meta_value = maybe_serialize( stripslashes( $meta_value ) );
         $meta_id = (int) $meta_id;