CVS update: /cowiki/includes/cowiki/class/core/

User: nibra   
Date: 05/03/15 05:38:09

Modified:
 /cowiki/includes/cowiki/class/core/
  class.Registry.php

Log:
 Reverted to 1.16

File Changes:

Directory: /cowiki/includes/cowiki/class/core/
==============================================

File [changed]: class.Registry.php
Url: http://cowiki.tigris.org/source/browse/cowiki/includes/cowiki/class/core/class.Registry.php?r1=1.17&r2=1.18
Delta lines:  +5 -9
-------------------
--- class.Registry.php	12 Mar 2005 02:31:03 -0000	1.17
+++ class.Registry.php	15 Mar 2005 13:38:09 -0000	1.18
@@ -2,7 +2,7 @@
 
 /**
  *
- * $Id: class.Registry.php,v 1.17 2005/03/12 02:31:03 nibra Exp $
+ * $Id: class.Registry.php,v 1.18 2005/03/15 13:38:09 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.17 $
+ * @version     $Revision: 1.18 $
  *
  */
 
@@ -155,7 +155,7 @@
 
         // Get template configuration file and define constants
         try {
-            $this->getTplConf($sTemplate);
+            $this->getTplConf($this->get('PATH_TEMPLATE_ACTIVE'));
         } catch (GenericException $e) {
             throw $e; // rethrow
         }
@@ -192,14 +192,10 @@
      */
     public function getTplConf($sActTpl) {
         $Context = RuntimeContext::getInstance();
-        $PathInfo = $Context->getPathInfo();
 
         try {
-            $sPath = $PathInfo->getPath('TEMPLATE') .
-                     DIRECTORY_SEPARATOR .
-                     $sActTpl .
-                     DIRECTORY_SEPARATOR .
-                     'tpl.conf';
+            $sPath = $Context->getEnvironment()->get('COWIKI_ROOT')
+                     . $sActTpl . 'tpl.conf';
 
             $Conf = new Config();
             $aConf = $Conf->getIniConfigAsArray($sPath);