CVS update: /cowiki/includes/cowiki/class/core/
[email protected] 15 Mar 2005 13:30:20 -0000
| Newsgroups | gmane.comp.php.cowiki.cvs |
|---|---|
| Message-ID | <[email protected]> |
User: nibra Date: 05/03/15 05:30:20 Modified: /cowiki/includes/cowiki/class/core/ class.TemplateLoader.php Log: Reverted to 1.12 File Changes: Directory: /cowiki/includes/cowiki/class/core/ ============================================== File [changed]: class.TemplateLoader.php Url: http://cowiki.tigris.org/source/browse/cowiki/includes/cowiki/class/core/class.TemplateLoader.php?r1=1.13&r2=1.14 Delta lines: +6 -9 ------------------- --- class.TemplateLoader.php 12 Mar 2005 03:30:25 -0000 1.13 +++ class.TemplateLoader.php 15 Mar 2005 13:30:19 -0000 1.14 @@ -2,7 +2,7 @@ /** * - * $Id: class.TemplateLoader.php,v 1.13 2005/03/12 03:30:25 nibra Exp $ + * $Id: class.TemplateLoader.php,v 1.14 2005/03/15 13:30:19 nibra Exp $ * * This file is part of coWiki. coWiki is free software under the terms of * the GNU General Public License (GPL). Read the LICENSE file. If you did @@ -17,7 +17,7 @@ * @author Daniel T. Gorski, <[email protected]> * @copyright (C) Daniel T. Gorski, {@link http://www.develnet.org} * @license http://www.gnu.org/licenses/gpl.html - * @version $Revision: 1.13 $ + * @version $Revision: 1.14 $ * */ @@ -65,17 +65,14 @@ $Context = RuntimeContext::getInstance(); $Registry = $Context->getRegistry(); - $PathInfo = $Context->getPathInfo(); // Get template file path - $sFileName = $PathInfo->getPath('TEMPLATE_ACTIVE') - .DIRECTORY_SEPARATOR - .$sTplName; + $sFileName = $Context->getEnvironment()->get('COWIKI_ROOT') + .$Registry->get('PATH_TEMPLATE_ACTIVE') // Get fallback template file path, if active template lacks a file - $sDefName = $PathInfo->getPath('TEMPLATE_DEFAULT') - .DIRECTORY_SEPARATOR - .$sTplName; + $sDefName = $Context->getEnvironment()->get('DOCUMENT_ROOT') + .$Registry->get('PATH_TEMPLATE_DEFAULT') // Predefine for error case $sFile = '';