Ignore:
Timestamp:
2010/11/06 10:20:24 (16 years ago)
Author:
nanasess
Message:

Merged r18888:18901

Location:
branches/camp/camp-2_5-E
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/camp/camp-2_5-E

  • branches/camp/camp-2_5-E/data/class/SC_View.php

    r18873 r18910  
    181181        $this->_smarty->template_dir = TEMPLATE_ADMIN_DIR; 
    182182        $this->_smarty->compile_dir = COMPILE_ADMIN_DIR; 
    183         $this->assign("TPL_DIR", URL_DIR . USER_DIR . USER_PACKAGE_DIR . DEFAULT_TEMPLATE_NAME . "/"); 
     183        $this->assign('TPL_DIR_DEFAULT', URL_DIR . USER_DIR . USER_PACKAGE_DIR . DEFAULT_TEMPLATE_NAME . '/'); 
     184        $this->assign('TPL_DIR', URL_DIR . USER_DIR . USER_PACKAGE_DIR . 'admin/'); 
    184185        $this->initpath(); 
    185186    } 
Note: See TracChangeset for help on using the changeset viewer.