Changeset 413:9128e2f6085b

Timestamp:

06/24/11 15:25:24 (14 years ago)

Author:

Dsls <dsls@…>

Branch:

default

Message:

Moved tag templates to their plugin directory, fixed some troubles with tplIfConditions behavior. Closes #1131

Files:

• inc/public/class.dc.template.php (modified) (5 diffs)
• plugins/tags/_public.php (modified) (2 diffs)
• plugins/tags/default-templates/tag.html (moved) (moved from inc/public/default-templates/tag.html)
• plugins/tags/default-templates/tags.html (moved) (moved from inc/public/default-templates/tags.html)

inc/public/class.dc.template.php

@@ -1002 +1002 @@
           
           if (!empty($if)) {
-               return '<?php if('.implode(' '.$operator.' ',$if).') : ?>'.$content.'<?php endif; ?>';
+               return '<?php if('.implode(' '.$operator.' ', (array) $if).') : ?>'.$content.'<?php endif; ?>';
           } else {
                return $content;
@@ -1356 +1356 @@
           
           if (!empty($if)) {
-               return '<?php if('.implode(' '.$operator.' ',(array)$if).') : ?>'.$content.'<?php endif; ?>';
+               return '<?php if('.implode(' '.$operator.' ', (array) $if).') : ?>'.$content.'<?php endif; ?>';
           } else {
                return $content;
@@ -2009 +2009 @@
           
           if (!empty($if)) {
-               return '<?php if('.implode(' && ',$if).') : ?>'.$content.'<?php endif; ?>';
+               return '<?php if('.implode(' && ', (array) $if).') : ?>'.$content.'<?php endif; ?>';
           } else {
                return $content;
@@ -2284 +2284 @@
           
           if (!empty($if)) {
-               return '<?php if('.implode(' && ',$if).') : ?>'.$content.'<?php endif; ?>';
+               return '<?php if('.implode(' && ', (array) $if).') : ?>'.$content.'<?php endif; ?>';
           } else {
                return $content;
@@ -2862 +2862 @@
           
           if (!empty($if)) {
-               return '<?php if('.implode(' '.$operator.' ',$if).') : ?>'.$content.'<?php endif; ?>';
+               return '<?php if('.implode(' '.$operator.' ', (array) $if).') : ?>'.$content.'<?php endif; ?>';
           } else {
                return $content;

plugins/tags/_public.php

@@ -45 +45 @@
 $core->addBehavior('templateBeforeBlock',array('behaviorsTags','templateBeforeBlock'));
 $core->addBehavior('tplSysIfConditions',array('behaviorsTags','tplSysIfConditions'));
+$core->addBehavior('publicBeforeDocument',array('behaviorsTags','addTplPath'));
 
 class behaviorsTags
@@ -83 +84 @@
           }
      }
+     
+     public static function addTplPath($core)
+     {
+          $core->tpl->setPath($core->tpl->getPath(), dirname(__FILE__).'/default-templates');
+     }
+
 }