[Phpgroupware-cvs] phpgwapi/inc class.Template.inc.php, 1.35 functions.inc.php, 1.177

[fipsfuchs]

Update of phpgwapi/inc

Modified Files:
     Branch: MAIN
            class.Template.inc.php lines: +2 -2
            functions.inc.php lines: +4 -2

Log Message:
fall back tpl set is now tpl set 'base'

====================================================
Index: phpgwapi/inc/class.Template.inc.php
diff -u phpgwapi/inc/class.Template.inc.php:1.34 
phpgwapi/inc/class.Template.inc.php:1.35
--- phpgwapi/inc/class.Template.inc.php:1.34    Thu Dec 30 06:47:30 2004
+++ phpgwapi/inc/class.Template.inc.php Tue Jan 11 13:39:47 2005
@@ -386,7 +386,7 @@
                                }
                                else
                                {
-                                       $new_root = 
str_replace($GLOBALS['phpgw_info']['server']['template_set'],'simple',$root);
+                                       $new_root = 
str_replace($GLOBALS['phpgw_info']['server']['template_set'],'base',$root);
                                        $new_filename = 
$this->filename(str_replace($root.'/','',$new_filename),$new_root,2);
                                }
                        }

====================================================
Index: phpgwapi/inc/functions.inc.php
diff -u phpgwapi/inc/functions.inc.php:1.176 
phpgwapi/inc/functions.inc.php:1.177
--- phpgwapi/inc/functions.inc.php:1.176        Thu Dec 30 06:47:31 2004
+++ phpgwapi/inc/functions.inc.php      Tue Jan 11 13:39:26 2005
@@ -380,7 +380,8 @@
                                
$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] = 
$GLOBALS['phpgw_info']['server']['force_theme'];
                        }
                }
-
+
+               /* Core-Team decided to use CSS
                if(@file_exists(PHPGW_SERVER_ROOT . '/phpgwapi/themes/' . 
$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] . '.theme'))
                {
                        include(PHPGW_SERVER_ROOT . '/phpgwapi/themes/' . 
$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] . '.theme');
@@ -398,6 +399,7 @@

                        exit;
                }
+               */
                unset($theme_to_load);

                
/*************************************************************************\