Changeset 1153:1e48950b05af for inc/core

Timestamp:

04/02/13 13:15:32 (12 years ago)

Author:

Dsls <dsls@…>

Branch:

twig

Parents:

1152:fbd922f6ed09 (diff), 1138:11db80678704 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge

File:

• inc/core/class.dc.core.php (modified) (2 diffs)

inc/core/class.dc.core.php

@@ -96 +96 @@
           $this->addFormater('xhtml', create_function('$s','return $s;'));
           $this->addFormater('wiki', array($this,'wikiTransform'));
-          
-          $this->tpl = new dcTemplate(DC_TPL_CACHE,'$core->tpl',$this);
+          $this->loadTemplateEnvironment();
      }
      
@@ -119 +118 @@
           
           return new $c($this);
+     }
+     
+     /**
+     Create template environment (Twig_Environment instance)
+     
+     default-templates path must be added from admin|public/prepend.php with:
+     $core->tpl->getLoader()->addPath('PATH_TO/default-templates');
+     Selected theme path must be added with:
+     $core->tpl->getLoader()->prependPath('PATH_TO/MY_THEME');
+     */
+     public function loadTemplateEnvironment()
+     {
+          $cache_dir = path::real(DC_TPL_CACHE.'/twtpl',false);
+          if (!is_dir($cache_dir)) {
+               try {
+                    files::makeDir($cache_dir);
+               } catch (Exception $e) {
+                    $cache_dir = false;
+               }
+          }
+          
+          $this->tpl = new Twig_Environment(
+               new Twig_Loader_Filesystem(dirname(__FILE__).'/../swf'),
+               array(
+                    'auto_reload' => true,
+                    'autoescape' => false,
+                    'base_template_class' => 'Twig_Template',
+                    'cache' => $cache_dir, 
+                    'charset' => 'UTF-8',
+                    'debug' => DC_DEBUG,
+                    'optimizations' => -1,
+                    'strict_variables' => 0 //DC_DEBUG // Please fix undefined variables!
+               )
+          );
+          $this->tpl->addExtension(new dcFormExtension($this));
+          $this->tpl->addExtension(new dcTabExtension($this));
      }