Make sure $icon_theme_path is set correctly when users aren't logged in.

[squirrelmail.git] / include / init.php

diff --git a/include/init.php b/include/init.php
index 9ec05a318219ccdaefdeca7d4eefc83cb7035193..6c3e957ecb294089cda81894c6f0774eaadeab28 100644 (file)
--- a/include/init.php
+++ b/include/init.php
@@ -503,9 +503,8 @@ if (!isset($sTplDir)) {
     $aTemplateSet = ( !isset($aTemplateSet) ? array() : $aTemplateSet );
     $templateset_default = ( !isset($templateset_default) ? 0 : $templateset_default );
     
-    $sTplDir = ( !isset($aTemplateSet[$templateset_default]['PATH']) ?
-                 SM_PATH . 'templates/default/' :
-                 $aTemplateSet[$templateset_default]['PATH'] );
+    $sTplDir = !isset($aTemplateSet[$templateset_default]['PATH']) ? SM_PATH . 'templates/default/' : $aTemplateSet[$templateset_default]['PATH'];
+    $icon_theme_path = !$use_icons ? NULL : $sTplDir . 'images/';
 }
 $oTemplate = new Template($sTplDir);