Changeset 862 for trunk/xpressme_integration_kit/wp-content/plugins

Timestamp:

Jun 16, 2016, 11:56:31 AM (8 years ago)

Author:

toemon

Message:

WP4.5よりxpressmeでオーバーライドしているget_currentuserinfo()が非推奨となったための対策 Fix #433

Location:

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include

Files:

• custom_functions.php (modified) (1 diff)
• pluggable-override.php (modified) (2 diffs)

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php

@@ -32 +32 @@
 {
         global $current_user;
-        get_currentuserinfo();
+        xpress_get_current_user();
         if (xpress_user_access_level() > 3)
                 return true;

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/pluggable-override.php

@@ -17 +17 @@
 if ( !function_exists('get_currentuserinfo') ) :
 function get_currentuserinfo() {
+    global $current_user;
+    global $xoopsModule,$xoopsUser,$xoopsUserIsAdmin;
+    xpress_get_current_user();    
+}
+endif;
+
+if ( !function_exists('wp_get_current_user') ) :
+function wp_get_current_user() {
+    global $current_user;
+    global $xoopsModule,$xoopsUser,$xoopsUserIsAdmin;
+    xpress_get_current_user();
+    return $current_user;
+}
+endif;
+
+
+if ( !function_exists('xpress_get_current_user') ) :
+function xpress_get_current_user() {
         global $current_user;
         global $xoopsModule,$xoopsUser,$xoopsUserIsAdmin;
@@ -72 +90 @@
                                  }
                         }
-                        wp_set_current_user($user);
+                        $user_id = apply_filters( 'determine_current_user', false );
+                        if ( ! $user_id ) {
+                            wp_set_current_user( 0 );
+                            return false;
+                        }
+
+                        wp_set_current_user( $user_id );
+
+//                      wp_set_current_user($user);
                 } else { // for WP2.0
                         if ( empty($_COOKIE[USER_COOKIE]) || empty($_COOKIE[PASS_COOKIE]) ||