Wordpress 2.8.5-scripts

[autoinstalls/wordpress.git] / wp-admin / admin-ajax.php

diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php
index 1fd0df5342c40c498be99d785b196a9733b8091e..7f04dd7d1473714701897d98f7621c400edddd3c 100644 (file)
--- a/wp-admin/admin-ajax.php
+++ b/wp-admin/admin-ajax.php
@@ -602,8 +602,12 @@ case 'add-comment' :
        if ( !current_user_can( 'edit_post', $id ) )
                die('-1');
        $search = isset($_POST['s']) ? $_POST['s'] : false;
-       $start = isset($_POST['page']) ? intval($_POST['page']) * 25 - 1: 24;
-       $status = isset($_POST['comment_status']) ? $_POST['comment_status'] : false;
+       $status = isset($_POST['comment_status']) ? $_POST['comment_status'] : 'all';
+       $per_page = isset($_POST['per_page']) ?  (int) $_POST['per_page'] + 8 : 28;
+       $start = isset($_POST['page']) ? ( intval($_POST['page']) * $per_page ) -1 : $per_page - 1;
+       if ( 1 > $start )
+               $start = 27;
+
        $mode = isset($_POST['mode']) ? $_POST['mode'] : 'detail';
        $p = isset($_POST['p']) ? $_POST['p'] : 0;
        $comment_type = isset($_POST['comment_type']) ? $_POST['comment_type'] : '';
@@ -814,8 +818,10 @@ case 'add-meta' :
                        die('0'); // if meta doesn't exist
                if ( !current_user_can( 'edit_post', $meta->post_id ) )
                        die('-1');
-               if ( !$u = update_meta( $mid, $key, $value ) )
-                       die('0'); // We know meta exists; we also know it's unchanged (or DB error, in which case there are bigger problems).
+               if ( $meta->meta_value != stripslashes($value) ) {
+                       if ( !$u = update_meta( $mid, $key, $value ) )
+                               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);