Changeset 7846

Timestamp:

03/12/08 23:54:04 (7 months ago)

Author:

fabien

Message:

allowed customisation of decorator directory (closes #3056 - patch from pookey)

Files:

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

branches/1.1/lib/config/sfApplicationConfiguration.class.php

@@ -342 +342 @@
-
-  /**
+   * Gets the decorator directories.
+   *
+   * @param  string The template file
+   *
+   * @return array  An array of the decorator directories
+   *
+   */
+  public function getDecoratorDirs()
+  {
+    return array(sfConfig::get('sf_app_template_dir'));
+  }
+
+  /**
+   * Gets the decorator directory for a given template.
+   *
+   * @param  string The template file
+   *
+   * @return string A template directory
+   */
+  public function getDecoratorDir($template)
+  {
+    foreach ($this->getDecoratorDirs() as $dir)
+    {
+      if (is_readable($dir.'/'.$template))
+      {
+        return $dir;
+      }
+    }
+  }
+
+  /**
-   * Gets the i18n directories to use globally.
-   *

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

@@ -372 +372 @@
-    }
-
+    if (!strpos($template, '.'))
+    {
+      $template .= $this->getExtension();
+    }
+
-    if (sfToolkit::isPathAbsolute($template))
-    {
@@ -379 +384 @@
-    else
-    {
+      $this->decoratorDirectory = $this->context->getConfiguration()->getDecoratorDir($template);
-      $this->decoratorTemplate = $template;
-    }
-
-    if (!strpos($this->decoratorTemplate, '.'))
-    {
-      $this->decoratorTemplate .= $this->getExtension();
-    }
-