Changeset 33840

Timestamp:

09/01/2015 03:56:44 AM (9 years ago)

Author:

wonderboymusic

Message:

User Settings: allow dashes in get|set_user_setting() in PHP and get|setUserSetting() in JS.

Add unit tests - there were none. Mock set_user_setting() since it won't run due to headers_sent() being true.

Fixes #22781.

Location:

trunk

Files:

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

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_-]/, '' );
 
     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_-]/, '' );
     }
 

trunk/src/wp-includes/option.php

@@ -901 +901 @@
 
     if ( isset( $_COOKIE['wp-settings-' . $user_id] ) ) {
-        $cookie = preg_replace( '/[^A-Za-z0-9=&_]/', '', $_COOKIE['wp-settings-' . $user_id] );
+        $cookie = preg_replace( '/[^A-Za-z0-9=&_-]/', '', $_COOKIE['wp-settings-' . $user_id] );
 
         if ( strpos( $cookie, '=' ) ) { // '=' cannot be 1st char
@@ -941 +941 @@
     $settings = '';
     foreach ( $user_settings as $name => $value ) {
-        $_name = preg_replace( '/[^A-Za-z0-9_]+/', '', $name );
-        $_value = preg_replace( '/[^A-Za-z0-9_]+/', '', $value );
+        $_name = preg_replace( '/[^A-Za-z0-9_-]+/', '', $name );
+        $_value = preg_replace( '/[^A-Za-z0-9_-]+/', '', $value );
 
         if ( ! empty( $_name ) ) {