From 155edcbb7d3dae2f1dc336b10d1a8324b9860d51 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Wed, 28 Jul 2010 15:15:23 +0200
Subject: [PATCH] Revert "Fix portal access"

This reverts commit da1e6a55be90f4653aa964ee1003c44a1701846a.

This broke initial_application redirection after logging in.
---
 horde/index.php | 3 +--
 horde/login.php | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/horde/index.php b/horde/index.php
index 48a8176d2..fb17aefa3 100644
--- 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 b8ee8776e..128dafeb5 100644
--- a/horde/login.php
+++ b/horde/login.php
@@ -217,7 +217,6 @@ if ($error_reason) {
             }
         }
 
-        $login_redirect = true;
         require HORDE_BASE . '/index.php';
         exit;
     }
-- 
2.11.0