Changeset 1376


Ignore:
Timestamp:
Jun 22, 2006, 8:17:47 PM (18 years ago)
Author:
nikrou
Message:

issue 426 step 1 reverted:
svn merge -r1466:1465 .
svn merge -r1463:1462 .

Location:
trunk
Files:
2 deleted
3 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/include/common.inc.php

    r1366 r1376  
    202202// TODO : replace initial $user['template'] by $user['layout']
    203203
    204 if (defined('IN_ADMIN') && IN_ADMIN)
    205 {
    206   $template_root = 'admin';
    207 }
    208 else
    209 {
    210   $template_root = 'public';
    211 }
    212204include(
    213205  PHPWG_ROOT_PATH
    214   .'template/'.$template_root.'/'.$user['template']
     206  .'template/'.$user['template']
    215207  .'/theme/'.$user['theme']
    216208  .'/themeconf.inc.php'

  • trunk/include/functions.inc.php

    r1364 r1376  
    598598 * returns available template/theme
    599599 */
    600 function get_pwg_themes($template_root = 'public')
     600function get_pwg_themes()
    601601{
    602602  $themes = array();
    603603
    604   $template_dir = PHPWG_ROOT_PATH.'template'.'/'.$template_root;
     604  $template_dir = PHPWG_ROOT_PATH.'template';
    605605
    606606  foreach (get_dirs($template_dir) as $template)

  • trunk/include/page_header.php

    r1366 r1376  
    2929// Start output of page
    3030//
    31 if (defined('IN_ADMIN') && IN_ADMIN)
    32 {
    33   $template->set_rootdir(PHPWG_ROOT_PATH.'template/admin/'.$user['template']);
    34   $template->set_filenames(array('header'=>'header.tpl'));
    35 }
    36 else
    37 {
    38   $template->set_rootdir(PHPWG_ROOT_PATH.'template/public/'.$user['template']);
    39   $template->set_filenames(array('header'=>'header.tpl'));
    40 }
     31$template->set_filenames(array('header'=>'header.tpl'));
    4132
    4233$template->assign_vars(
Note: See TracChangeset for help on using the changeset viewer.