projects
/
horde.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3257a00
)
Revert "Fix portal access"
author
Jan Schneider
<jan@horde.org>
Wed, 28 Jul 2010 13:15:23 +0000
(15:15 +0200)
committer
Jan Schneider
<jan@horde.org>
Wed, 28 Jul 2010 13:15:23 +0000
(15:15 +0200)
This reverts commit
da1e6a55be90f4653aa964ee1003c44a1701846a
.
This broke initial_application redirection after logging in.
horde/index.php
patch
|
blob
|
history
horde/login.php
patch
|
blob
|
history
diff --git
a/horde/index.php
b/horde/index.php
index
48a8176
..
fb17aef
100644
(file)
--- a/
horde/index.php
+++ b/
horde/index.php
@@
-55,8
+55,7
@@
if (!$main_page) {
} else {
/* Search for a user-specified initial application. */
$initial_app = $prefs->getValue('initial_application');
- if (Horde_Util::nonInputVar('login_redirect') &&
- !empty($initial_app) &&
+ if (!empty($initial_app) &&
($initial_app != 'horde') &&
$registry->hasPermission($initial_app)) {
$main_page = Horde::url($initial_app, true) . '/';
diff --git
a/horde/login.php
b/horde/login.php
index
b8ee877
..
128dafe
100644
(file)
--- a/
horde/login.php
+++ b/
horde/login.php
@@
-217,7
+217,6
@@
if ($error_reason) {
}
}
- $login_redirect = true;
require HORDE_BASE . '/index.php';
exit;
}