Changeset 23554 for trunk/wp-includes/taxonomy.php

Timestamp:

03/01/2013 04:28:40 PM (12 years ago)

Author:

ryan

Message:

Revert 23416, 23419, 23445 except for wp_reset_vars() changes. We are going a different direction with the slashing cleanup, so resetting to a clean slate. see #21767

File:

• trunk/wp-includes/taxonomy.php (modified) (5 diffs)

trunk/wp-includes/taxonomy.php

@@ -959 +959 @@
             return false;
     } else if ( 'name' == $field ) {
+        // Assume already escaped
+        $value = stripslashes($value);
         $field = 't.name';
     } else {
@@ -1498 +1500 @@
     }
 
-    $term = trim( $term );
+    $term = trim( stripslashes( $term ) );
 
     if ( '' === $slug = sanitize_title($term) )
@@ -2059 +2061 @@
     $args = sanitize_term($args, $taxonomy, 'db');
     extract($args, EXTR_SKIP);
+
+    // expected_slashed ($name)
+    $name = stripslashes($name);
+    $description = stripslashes($description);
 
     if ( empty($slug) )
@@ -2439 +2445 @@
         return $term;
 
+    // Escape data pulled from DB.
+    $term = add_magic_quotes($term);
+
     // Merge old and new args with new args overwriting old ones.
     $args = array_merge($term, $args);
@@ -2446 +2455 @@
     $args = sanitize_term($args, $taxonomy, 'db');
     extract($args, EXTR_SKIP);
+
+    // expected_slashed ($name)
+    $name = stripslashes($name);
+    $description = stripslashes($description);
 
     if ( '' == trim($name) )