From 7869819cbfd94103184a404de1ba08b10b9d0b7c Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Mon, 28 Jun 2010 13:29:22 -0600 Subject: [PATCH] Bug #9085: get clean session if doing transparent auth in a non authenticated Horde session --- framework/Core/lib/Horde/Registry.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php index f8c88585a..e1adf8d8b 100644 --- a/framework/Core/lib/Horde/Registry.php +++ b/framework/Core/lib/Horde/Registry.php @@ -1663,17 +1663,18 @@ class Horde_Registry if ($this->getAuth() && (($app == 'horde') || isset($_SESSION['horde_auth']['app'][$app]))) { - if ($this->checkExistingAuth($app)) { - return true; - } - - return false; + return $this->checkExistingAuth($app); } /* Try transparent authentication. */ - return empty($options['notransparent']) - ? $GLOBALS['injector']->getInstance('Horde_Auth')->getAuth($app)->transparent() - : false; + if (empty($options['notransparent'])) { + if (!$this->getAuth()) { + $this->getCleanSession(); + } + return $GLOBALS['injector']->getInstance('Horde_Auth')->getAuth($app)->transparent(); + } + + return false; } /** -- 2.11.0