Changeset 863:88e1ebd4efa0

Timestamp:

08/03/12 23:22:56 (13 years ago)

Author:

JcDenis

Branch:

default

Children:

864:73d1af790506, 1025:f86362da37de

Message:

Moved tpl attribut has_tag to the right place, fixes #1316

Files:

• inc/public/class.dc.template.php (modified) (2 diffs)
• plugins/tags/_public.php (modified) (2 diffs)

inc/public/class.dc.template.php

@@ -2802 +2802 @@
      current_mode        CDATA     #IMPLIED  -- tests if current URL mode is the one given in parameter
      has_tpl             CDATA     #IMPLIED  -- tests if a named template exists
-     has_tag             CDATA     #IMPLIED  -- tests if a named template tag exists (see Tag plugin for code)
+     has_tag             CDATA     #IMPLIED  -- tests if a named template block or value exists
      blog_id             CDATA     #IMPLIED  -- tests if current blog ID is the one given in parameter
      comments_active     (0|1)     #IMPLIED  -- test if comments are enabled blog-wide 
@@ -2856 +2856 @@
                }
                $if[] = $sign."\$core->tpl->getFilePath('".addslashes($attr['has_tpl'])."') !== false";
+          }
+          
+          if (isset($attr['has_tag'])) {
+               $sign = 'true';
+               if (substr($attr['has_tag'],0,1) == '!') {
+                    $sign = 'false';
+                    $attr['has_tag'] = substr($attr['has_tag'],1);
+               }
+               $if[] =  "\$core->tpl->tagExists('".addslashes($attr['has_tag'])."') === ".$sign;
           }
           

plugins/tags/_public.php

@@ -44 +44 @@
 
 $core->addBehavior('templateBeforeBlock',array('behaviorsTags','templateBeforeBlock'));
-$core->addBehavior('tplSysIfConditions',array('behaviorsTags','tplSysIfConditions'));
 $core->addBehavior('publicBeforeDocument',array('behaviorsTags','addTplPath'));
 
@@ -70 +69 @@
                     "\$params['sql'] .= \"AND META.meta_id = '\".\$core->con->escape(\$_ctx->meta->meta_id).\"' \";\n".
                "} ?>\n";
-          }
-     }
-     
-     public static function tplSysIfConditions($tag, $attr,$content,$if)
-     {
-          if ($tag == 'Sys' && isset($attr['has_tag'])) {
-               $sign = '';
-               if (substr($attr['has_tag'],0,1) == '!') {
-                    $sign = '!';
-                    $attr['has_tag'] = substr($attr['has_tag'],1);
-               }
-               $if[] =  $sign."(\$core->tpl->tagExists('".addslashes($attr['has_tag'])."') )";
           }
      }