[evolvis-commits] r7115: improve return_to behaviour for /, /my/ and /account/ ↵
mirabilos at evolvis.org
mirabilos at evolvis.org
Wed Dec 15 16:24:12 CET 2010
Author: mirabilos
Date: 2010-12-15 16:24:12 +0100 (Wed, 15 Dec 2010)
New Revision: 7115
Modified:
trunk/gforge_base/evolvisforge/gforge/debian/changelog
trunk/gforge_base/evolvisforge/gforge/www/account/login.php
trunk/gforge_base/evolvisforge/gforge/www/account/logout.php
Log:
improve return_to behaviour for /, /my/ and /account/
Modified: trunk/gforge_base/evolvisforge/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/debian/changelog 2010-12-15 15:24:10 UTC (rev 7114)
+++ trunk/gforge_base/evolvisforge/gforge/debian/changelog 2010-12-15 15:24:12 UTC (rev 7115)
@@ -39,6 +39,8 @@
* [#1138] Make compressor configurable; defaults to “xz -7e” now.
* [#1024] Show size (KiB), upload date and author for files attached
to a tracker item.
+ * Restore return_to behaviour for login to /my/ from front page,
+ and switch to front page from /my/ and /account/ pages.
[ Patrick Apel ]
* When sending out Tasks mails, issue permalinks [#1047].
@@ -46,7 +48,7 @@
* Bugfix [#1018] Status in Tasks falsch.
* [#1019] Cumulate Tasks estimated hours, display in overview.
- -- Thorsten Glaser <t.glaser at tarent.de> Wed, 15 Dec 2010 13:24:48 +0100
+ -- Thorsten Glaser <t.glaser at tarent.de> Wed, 15 Dec 2010 13:30:06 +0100
gforge (4.8.3+evolvis26.4) unstable; urgency=high
Modified: trunk/gforge_base/evolvisforge/gforge/www/account/login.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/account/login.php 2010-12-15 15:24:10 UTC (rev 7114)
+++ trunk/gforge_base/evolvisforge/gforge/www/account/login.php 2010-12-15 15:24:12 UTC (rev 7115)
@@ -48,6 +48,8 @@
!(strpos($tmpreturn[0], 'plugins/mediawiki') == 1)) {
$return_to = '/my/';
}
+ if ($return_to == '/')
+ $return_to = '/my/';
} else
$return_to = '/my/';
Modified: trunk/gforge_base/evolvisforge/gforge/www/account/logout.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/account/logout.php 2010-12-15 15:24:10 UTC (rev 7114)
+++ trunk/gforge_base/evolvisforge/gforge/www/account/logout.php 2010-12-15 15:24:12 UTC (rev 7115)
@@ -41,6 +41,8 @@
!(strpos($tmpreturn[0], 'plugins/mediawiki') == 1)) {
$return_to = '/';
}
+ if ($return_to == '/my/' || $return_to == '/account/')
+ $return_to = '/';
} else
$return_to = '/';
More information about the evolvis-commits
mailing list