Always add $base_uri to templates

[squirrelmail.git] / src / signout.php

diff --git a/src/signout.php b/src/signout.php
index 16841d63cfcfcea795b6e9ed0b7a611327465f09..3675686eafbb63a575d8bbf1c9db21eeeedfc099 100644 (file)
--- a/src/signout.php
+++ b/src/signout.php
@@ -37,8 +37,7 @@ if (! sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION) ) {
 
 $login_uri = 'login.php';
 
-$hook_results = do_hook('logout', $login_uri);
-if (!empty($hook_results[1])) $login_uri = $hook_results[1];
+do_hook('logout', $login_uri);
 
 sqsession_destroy();
 
@@ -58,7 +57,9 @@ if ( !isset($oTemplate) || !is_object($oTemplate) ) {
     $oTemplate = Template::construct_template($sTemplateID);
 
     // We want some variables to always be available to the template
-    $always_include = array('sTemplateID', 'icon_theme_path', 'javascript_on');
+    $oTemplate->assign('javascript_on', checkForJavascript());
+    $oTemplate->assign('base_uri', sqm_baseuri());
+    $always_include = array('sTemplateID', 'icon_theme_path');
     foreach ($always_include as $var) {
         $oTemplate->assign($var, (isset($$var) ? $$var : NULL));
     }