Changeset 1930

Timestamp:

08/14/2011 01:30:39 PM (9 months ago)

Author:

Xiping.Wang

Message:

[trunk] fix ReturnTo? action after the user logins

File:

• trunk/common/skins/mike2/header.php (modified) (1 diff)

trunk/common/skins/mike2/header.php

@@ -70 +70 @@
         <?php } ?>
         <li style="width: 60px; text-align: center;"><a href="<?php echo $omCollabAppURLs[WIKI] ?>Help:Contents"><span>Help</span></a></li>
-        <?php
+<?php
+    $sReturnTo = $_SERVER['REQUEST_URI'];
                 if(GetLoggedInStateFromWikiCookies()){ 
-                        echo '<li class="login"><a href="' . OMWIKI_SCRIPT_PATH . '/index.php?title=Special:Userlogout&returnto=' . RR_OMCOLLAB_DIRECTORY. '"><span>Logout</span></a></li>';
+                        echo '<li class="login"><a href="' . OMWIKI_SCRIPT_PATH . '/index.php?title=Special:Userlogout&returnto=' . $sReturnTo. '"><span>Logout</span></a></li>';
                 }else{
-                        echo '<li class="login"><a href="' . OMWIKI_SCRIPT_PATH . '/index.php?title=Special:Userlogin&returnto=' . RR_OMCOLLAB_DIRECTORY . '"><span>Login</span></a></li>';
+                        echo '<li class="login"><a href="' . OMWIKI_SCRIPT_PATH . '/index.php?title=Special:Userlogin&returnto=' . $sReturnTO . '"><span>Login</span></a></li>';
         } ?>
         </ul>