Changeset 797 for branches

Timestamp:

Nov 2, 2011, 8:08:19 PM (13 years ago)

Author:

toemon

Message:

XOOPSユーザから、WordPressユーザデータを作成する時
WordPressからユーザデータをアップデートする時
は、実質的にsanitize_userをパスする。
WordPress側から新規ユーザー登録する場合はsanitize_userを有効にする。
fixed #408

Location:

branches/Ver2.4/xpressme_integration_kit

Files:

• include/oninstall.php (modified) (1 diff)
• wp-content/plugins/xpressme/xpressme.php (modified) (1 diff)

branches/Ver2.4/xpressme_integration_kit/include/oninstall.php

@@ -300 +300 @@
 if( ! function_exists( 'sanitize_user_multibyte' ) ) :
 function sanitize_user_multibyte($username, $raw_username, $strict){
-        if ($username == "" && $strict){
-                if ($raw_username == ""){
-                        return $username;
-                } else{
-                        return sanitize_user($raw_username, false);
-                }
-        } else {
-                return $username;
-        }
+        if ($raw_username !== "" && $username !== $raw_username){
+                return $raw_username;
+        }
+        return $username;
 }
 endif;

branches/Ver2.4/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php

@@ -84 +84 @@
 
 // enable multibyte username
-if( ! function_exists( 'sanitize_user_multibyte' ) ){
-        function sanitize_user_multibyte($username, $raw_username, $strict){
-                if ($username == "" && $strict){
-                        if ($raw_username == ""){
-                                return $username;
-                        } else{
-                                return sanitize_user($raw_username, false);
-                        }
-                } else {
-                        return $username;
+if( ! function_exists( 'sanitize_user_multibyte_at_update' ) ){
+        function sanitize_user_multibyte_at_update($username, $raw_username, $strict){
+                if (isset($_POST['action']) && $_POST['action'] == 'update'){
+                        if ($raw_username !== "" && $username !== $raw_username){
+                                return $raw_username;
+                        } 
                 }
+                return $username;
         }
 }
-add_filter('sanitize_user', "sanitize_user_multibyte" ,10,3);
+add_filter('sanitize_user', "sanitize_user_multibyte_at_update" ,10,3);
 
 add_action('admin_menu', 'my_plugin_menu');