projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
separate multiple addresses with ",", put as much on a line
[squirrelmail.git]
/
src
/
redirect.php
diff --git
a/src/redirect.php
b/src/redirect.php
index aa5c42390b63f5cd82dee4ade7212a28c1feefe9..354cbc9f7e1c306ca72279680645c4739fa79178 100644
(file)
--- a/
src/redirect.php
+++ b/
src/redirect.php
@@
-136,6
+136,11
@@
if ( sqgetGlobalVar('HTTP_ACCEPT', $http_accept, SQ_SERVER) &&
attachment_common_parse($http_accept);
}
attachment_common_parse($http_accept);
}
+// having just logged in, need to synch the template file cache
+// so the right template set is displayed (per user prefs)
+require(SM_PATH . 'include/load_prefs.php');
+Template::cache_template_file_hierarchy(TRUE);
+
/* Complete autodetection of Javascript. */
checkForJavascript();
/* Complete autodetection of Javascript. */
checkForJavascript();
@@
-153,7
+158,8
@@
if ( sqgetGlobalVar('session_expired_location', $session_expired_location, SQ_SE
} else {
$redirect_url = $location . '/webmail.php?right_frame=' . urlencode($session_expired_location . '.php');
}
} else {
$redirect_url = $location . '/webmail.php?right_frame=' . urlencode($session_expired_location . '.php');
}
- } else if ($session_expired_location != 'webmail') {
+ } else if ($session_expired_location != 'webmail'
+ && $session_expired_location != 'left_main') {
$redirect_url = $location . '/webmail.php?right_frame=' . urlencode($session_expired_location . '.php');
}
unset($session_expired_location);
$redirect_url = $location . '/webmail.php?right_frame=' . urlencode($session_expired_location . '.php');
}
unset($session_expired_location);