Changeset 23416 for trunk/wp-includes/comment.php

Timestamp:

02/14/2013 10:51:06 PM (12 years ago)

Author:

ryan

Message:

Change all core API to expect unslashed rather than slashed arguments.

The exceptions to this are update_post_meta() and add_post_meta() which are often used by plugins in POST handlers and will continue accepting slashed data for now.

Introduce wp_upate_post_meta() and wp_add_post_meta() as unslashed alternatives to update_post_meta() and add_post_meta(). These functions could become methods in WP_Post so don't use them too heavily yet.

Remove all escape() calls from wp_xmlrpc_server. Now that core expects unslashed data this is no longer needed.

Remove addslashes(), addslashes_gpc(), add_magic_quotes() calls on data being prepared for handoff to core functions that until now expected slashed data. Adding slashes in no longer necessary.

Introduce wp_unslash() and use to it remove slashes from GPCS data before using it in core API. Almost every instance of stripslashes() in core should now be wp_unslash(). In the future (a release or three) when GPCS is no longer slashed, wp_unslash() will stop stripping slashes and simply return what is passed. At this point wp_unslash() calls can be removed from core.

Introduce wp_slash() for slashing GPCS data. This will also turn into a noop once GPCS is no longer slashed. wp_slash() should almost never be used. It is mainly of use in unit tests.

Plugins should use wp_unslash() on data being passed to core API.

Plugins should no longer slash data being passed to core. So when you get_post() and then wp_insert_post() the post data from get_post() no longer needs addslashes(). Most plugins were not bothering with this. They will magically start doing the right thing. Unfortunately, those few souls who did it properly will now have to avoid calling addslashes() for 3.6 and newer.

Use wp_kses_post() and wp_kses_data(), which expect unslashed data, instead of wp_filter_post_kses() and wp_filter_kses(), which expect slashed data. Filters are no longer passed slashed data.

Remove many no longer necessary calls to $wpdb->escape() and esc_sql().

In wp_get_referer() and wp_get_original_referer(), return unslashed data.

Remove old stripslashes() calls from WP_Widget::update() handlers. These haven't been necessary since WP_Widget.

Switch several queries over to prepare().

Expect something to break.

Props alexkingorg
see #21767

File:

• trunk/wp-includes/comment.php (modified) (7 diffs)

trunk/wp-includes/comment.php

@@ -634 +634 @@
 function sanitize_comment_cookies() {
     if ( isset($_COOKIE['comment_author_'.COOKIEHASH]) ) {
-        $comment_author = apply_filters('pre_comment_author_name', $_COOKIE['comment_author_'.COOKIEHASH]);
-        $comment_author = stripslashes($comment_author);
+        $comment_author = wp_unslash( $_COOKIE['comment_author_'.COOKIEHASH] );
+        $comment_author = apply_filters('pre_comment_author_name', $comment_author);
         $comment_author = esc_attr($comment_author);
         $_COOKIE['comment_author_'.COOKIEHASH] = $comment_author;
@@ -641 +641 @@
 
     if ( isset($_COOKIE['comment_author_email_'.COOKIEHASH]) ) {
-        $comment_author_email = apply_filters('pre_comment_author_email', $_COOKIE['comment_author_email_'.COOKIEHASH]);
-        $comment_author_email = stripslashes($comment_author_email);
+        $comment_author_email = wp_unslash( $_COOKIE['comment_author_email_'.COOKIEHASH] );
+        $comment_author_email = apply_filters('pre_comment_author_email', $comment_author_email);
         $comment_author_email = esc_attr($comment_author_email);
         $_COOKIE['comment_author_email_'.COOKIEHASH] = $comment_author_email;
@@ -648 +648 @@
 
     if ( isset($_COOKIE['comment_author_url_'.COOKIEHASH]) ) {
-        $comment_author_url = apply_filters('pre_comment_author_url', $_COOKIE['comment_author_url_'.COOKIEHASH]);
-        $comment_author_url = stripslashes($comment_author_url);
+        $comment_author_url = wp_unslash( $_COOKIE['comment_author_url_'.COOKIEHASH] );
+        $comment_author_url = apply_filters('pre_comment_author_url', $comment_author_url);
         $_COOKIE['comment_author_url_'.COOKIEHASH] = $comment_author_url;
     }
@@ -671 +671 @@
 
     // Simple duplicate check
-    // expected_slashed ($comment_post_ID, $comment_author, $comment_author_email, $comment_content)
-    $dupe = "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = '$comment_post_ID' AND comment_parent = '$comment_parent' AND comment_approved != 'trash' AND ( comment_author = '$comment_author' ";
+    $dupe = $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_parent = %s AND comment_approved != 'trash' AND ( comment_author = %s ", $comment_post_ID, $comment_parent, $comment_author );
     if ( $comment_author_email )
-        $dupe .= "OR comment_author_email = '$comment_author_email' ";
-    $dupe .= ") AND comment_content = '$comment_content' LIMIT 1";
+        $dupe .= $wpdb->prepare( "OR comment_author_email = %s ", $comment_author_email );
+    $dupe .= $wpdb->prepare( ") AND comment_content = %s LIMIT 1", $comment_content );
     if ( $wpdb->get_var($dupe) ) {
         do_action( 'comment_duplicate_trigger', $commentdata );
@@ -1263 +1262 @@
 function wp_insert_comment($commentdata) {
     global $wpdb;
-    extract(stripslashes_deep($commentdata), EXTR_SKIP);
+    extract($commentdata, EXTR_SKIP);
 
     if ( ! isset($comment_author_IP) )
@@ -1492 +1491 @@
     $comment = get_comment($commentarr['comment_ID'], ARRAY_A);
 
-    // Escape data pulled from DB.
-    $comment = esc_sql($comment);
-
     $old_status = $comment['comment_approved'];
 
@@ -1503 +1499 @@
 
     // Now extract the merged array.
-    extract(stripslashes_deep($commentarr), EXTR_SKIP);
+    extract($commentarr, EXTR_SKIP);
 
     $comment_content = apply_filters('comment_save_pre', $comment_content);