Ticket #7541: draft-notice-7541.diff

wp-admin/admin-ajax.php

@@ -770 +770 @@
         if ( isset($_POST['metakeyselect']) || isset($_POST['metakeyinput']) ) {
                 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 ) {
                         $now = current_time('timestamp', 1);
@@ -784 +784 @@
                                         ) );
                                         $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.'));
                 }
 
                 $meta = get_post_meta_by_id( $mid );
@@ -811 +812 @@
                 if ( !current_user_can( 'edit_post', $meta->post_id ) )
                         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);
                 $x = new WP_Ajax_Response( array(

wp-admin/includes/post.php

@@ -682 +682 @@
 
         $meta_value = maybe_serialize( stripslashes( $meta_value ));
         $meta_id = (int) $meta_id;
+        
+        if ('' == trim( $meta_value ) || empty ( $meta_value ) ) {
+                return false;
+        }
 
         $data  = compact( 'meta_key', 'meta_value' );
         $where = compact( 'meta_id' );