Ignore:
Timestamp:
Nov 4, 2008, 2:47:48 AM (15 years ago)
Author:
rvelices
Message:

merge -c2823 from branch 2.0 to trunk

  • removed some unused constants from constants.php
  • removed some unused css rules
  • removed unused code
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/common.inc.php

    r2770 r2824  
    144144
    145145// template instance
    146 if
    147   (
    148       defined('IN_ADMIN') and IN_ADMIN
    149   )
    150 {
    151   // Admin template
    152   //$template = new Template(PHPWG_ROOT_PATH.'template/'.$user['admin_template'], $user['admin_theme'] );
     146if ( defined('IN_ADMIN') and IN_ADMIN )
     147{// Admin template
    153148  list($user['admin_template'], $user['admin_theme']) =
    154149    explode ('/', $conf['admin_layout']);
     
    157152}
    158153else
    159 {
    160   // Classic template
     154{ // Classic template
    161155  $template = new Template(PHPWG_ROOT_PATH.'template/'
    162156    . $user['template'], $user['theme'] );
Note: See TracChangeset for help on using the changeset viewer.