Ticket #24106: 24106.2.patch

src/wp-includes/formatting.php

@@ -3404 +3404 @@
 }
 
 /**
- * Add slashes to a string or array of strings.
+ * Add slashes to a string or array of strings, in recursive manner.
  *
  * This should be used when preparing data for core API that expects slashed data.
  * This should not be used to escape data going directly into an SQL query.
@@ -3416 +3416 @@
  */
 function wp_slash( $value ) {
         if ( is_array( $value ) ) {
-                foreach ( $value as $k => $v ) {
-                        if ( is_array( $v ) ) {
-                                $value[$k] = wp_slash( $v );
-                        } else {
-                                $value[$k] = addslashes( $v );
-                        }
-                }
+                $value = array_map( 'wp_slash', $value );
         } else {
                 $value = addslashes( $value );
         }

tests/phpunit/tests/formatting/StripSlashesDeep.php

@@ -2 +2 @@
 
 /**
  * @group formatting
+ * @group slashes
  */
 class Tests_Formatting_StripSlashesDeep extends WP_UnitTestCase {
         /**

tests/phpunit/tests/formatting/WPSlash.php

@@ +1 @@
+<?php
+
+/**
+ * @group formatting
+ * @group slashes
+ */
+class Tests_Formatting_WPSlash extends WP_UnitTestCase {
+
+        /**
+         * @ticket 24106
+         */
+        function test_adds_slashes() {
+                $old = "I can't see, isn't that it?";
+                $new = "I can\'t see, isn\'t that it?";
+                $this->assertEquals( $new, wp_slash( $old ) );
+                $this->assertEquals( "I can\\\\\'t see, isn\\\\\'t that it?", wp_slash( $new ) );
+                $this->assertEquals( array( 'a' => $new ), wp_slash( array( 'a' => $old ) ) ); // Keyed array
+                $this->assertEquals( array( $new ), wp_slash( array( $old ) ) ); // Non-keyed
+        }
+
+}