Changeset 33947

Timestamp:

09/08/2015 04:43:27 PM (11 years ago)

Author:

wonderboymusic

Message:

After [33840], JS regex needs the g modifier.

Add another unit test case.

Props kitchin.
Fixes #22781.

Location:

trunk

Files:

• src/wp-includes/js/utils.js (modified) (1 diff)
• tests/phpunit/tests/option/userSettings.php (modified) (1 diff)

trunk/src/wp-includes/js/utils.js

@@ -162 +162 @@
                 secure = !! userSettings.secure;
 
-        name = name.toString().replace( /[^A-Za-z0-9_-]/, '' );
+        name = name.toString().replace( /[^A-Za-z0-9_-]/g, '' );
 
         if ( typeof value === 'number' ) {
                 value = parseInt( value, 10 );
         } else {
-                value = value.toString().replace( /[^A-Za-z0-9_-]/, '' );
+                value = value.toString().replace( /[^A-Za-z0-9_-]/g, '' );
         }
 

trunk/tests/phpunit/tests/option/userSettings.php

@@ -35 +35 @@
                 $this->assertEmpty( $foo );
 
-                $this->set_user_setting( 'foo', 'foo-bar' );
+                $this->set_user_setting( 'foo', 'foo-bar-baz' );
 
-                $this->assertEquals( 'foo-bar', get_user_setting( 'foo' ) );
+                $this->assertEquals( 'foo-bar-baz', get_user_setting( 'foo' ) );
+        }
+
+        function test_set_user_setting_strip_asterisks() {
+                $foo = get_user_setting( 'foo' );
+
+                $this->assertEmpty( $foo );
+
+                $this->set_user_setting( 'foo', 'foo*bar*baz' );
+
+                $this->assertEquals( 'foobarbaz', get_user_setting( 'foo' ) );
         }