Changeset 123

Timestamp:

Mar 19, 2009, 8:49:19 PM (16 years ago)

Author:

toemon

Message:

コメント部のログアウトを実行すると、ログアウト後、もとのページに戻ると、XOOSユーザとしてはログアウトしていないので、再びログインしてしまうバグ？を修正
コメントのログアウト時も、XOOPSログアウトへリダイレクトするようにした。

Location:

trunk/wp-content

Files:

• plugins/xpressme/include/pluggable-override.php (modified) (1 diff)
• themes/xpress_default/comments.php (modified) (1 diff)

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

@@ -164 +164 @@
 if ( !function_exists('wp_redirect') ) :
 function wp_redirect($location, $status = 302) {
-        global $is_IIS,$xoops_config;
+        global $is_IIS,$xoops_config,$action;
         
         if ($location == 'wp-login.php?loggedout=true') $location = $xoops_config->xoops_url.'/user.php?op=logout'; //xoops logout at wp logout
         if ($location == 'wp-login.php?action=register') $location = $xoops_config->xoops_url."/register.php";  //wp-register to xoops register
+        if ($action == 'logout') $location = $xoops_config->xoops_url.'/user.php?op=logout'; //xoops logout at comment logout
 
         $location = apply_filters('wp_redirect', $location, $status);

trunk/wp-content/themes/xpress_default/comments.php

@@ -88 +88 @@
                                 <?php if ( $user_ID ) : ?>
 
-                                        <p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>.', 'xpress'), get_option('siteurl') . '/wp-admin/profile.php', $user_identity); ?> <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account', 'xpress'); ?>"><?php _e('Log out &raquo;', 'xpress'); ?></a></p>
+                                        <p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>.', 'xpress'), get_option('siteurl') . '/wp-admin/profile.php', $user_identity); ?> <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php _e('Log out of this account', 'xpress'); ?>"><?php _e('Log out &raquo;', 'xpress'); ?></a></p>
 
                                 <?php else : ?>