From fe8103c21ce22c238382ebf17866594f72e9a8f5 Mon Sep 17 00:00:00 2001 From: pdontthink Date: Wed, 3 Jan 2007 09:46:30 +0000 Subject: [PATCH] Always add $base_uri to templates git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12053 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- include/init.php | 1 + src/right_main.php | 1 + src/search.php | 1 + src/signout.php | 1 + 4 files changed, 4 insertions(+) diff --git a/include/init.php b/include/init.php index 054f3a7b..811205ff 100644 --- a/include/init.php +++ b/include/init.php @@ -573,6 +573,7 @@ if (empty($oTemplate)) { // We want some variables to always be available to the template $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)); diff --git a/src/right_main.php b/src/right_main.php index bd6fbab4..ae8a1888 100644 --- a/src/right_main.php +++ b/src/right_main.php @@ -309,6 +309,7 @@ if ($aMailbox['EXISTS'] > 0) { $oTemplate->assign('page_selector_max', $page_selector_max); $oTemplate->assign('compact_paginator', $compact_paginator); $oTemplate->assign('javascript_on', checkForJavascript()); + $oTemplate->assign('base_uri', sqm_baseuri()); $oTemplate->assign('enablesort', (isset($aProps['config']['enablesort'])) ? $aProps['config']['enablesort'] : false); $oTemplate->assign('icon_theme_path', $icon_theme_path); $oTemplate->assign('aOrder', array_keys($aColumns)); diff --git a/src/search.php b/src/search.php index d17a13d9..d5362987 100644 --- a/src/search.php +++ b/src/search.php @@ -1607,6 +1607,7 @@ if ($submit == $search_button_text) { $oTemplate->assign('page_selector_max', $page_selector_max); $oTemplate->assign('compact_paginator', $compact_paginator); $oTemplate->assign('javascript_on', checkForJavascript()); + $oTemplate->assign('base_uri', sqm_baseuri()); $oTemplate->assign('enablesort', (isset($aProps['config']['enablesort'])) ? $aProps['config']['enablesort'] : false); $oTemplate->assign('icon_theme_path', $icon_theme_path); $oTemplate->assign('use_icons', (isset($use_icons)) ? $use_icons : false); diff --git a/src/signout.php b/src/signout.php index 30180a09..3675686e 100644 --- a/src/signout.php +++ b/src/signout.php @@ -58,6 +58,7 @@ if ( !isset($oTemplate) || !is_object($oTemplate) ) { // We want some variables to always be available to the template $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)); -- 2.25.1