Changeset 8083

Timestamp:

03/25/08 18:49:13 (1 year ago)

Author:

dwhittle

Message:

1.1: tweaked template handling (to use configuartion->getTemplatePath / getDecoratorDir)

Files:

• branches/1.1/lib/view/sfPartialView.class.php (modified) (2 diffs)
• branches/1.1/lib/view/sfView.class.php (modified) (1 diff)

branches/1.1/lib/view/sfPartialView.class.php

@@ -4 +4 @@
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- 
+
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
@@ -40 +40 @@
-  {
-    $this->setDecorator(false);
-
-    $this->setTemplate($this->actionName.$this->getExtension());
-    if ('global' == $this->moduleName)
-    {
-sfConfig::get('sf_app_template_dir'
+$this->context->getConfiguration()->getDecoratorDir($this->getTemplate()
-    }
-    else

branches/1.1/lib/view/sfView.class.php

@@ -460 +460 @@
-    else
-    {
+      $this->directory = $this->context->getConfiguration()->getTemplateDir($this->moduleName, $template);
-      $this->template = $template;
-    }