Changeset 2679

Timestamp:

08/19/08 16:37:43 (5 months ago)

Author:

david

Message:

Allow skipping of template auto-assigns, closes #605

Location:

branches/1.0

Files:

• CHANGELOG (modified) (1 diff)
• src/renderer/AgaviEzctemplateRenderer.class.php (modified) (1 diff)
• src/renderer/AgaviPhpRenderer.class.php (modified) (1 diff)
• src/renderer/AgaviPhptalRenderer.class.php (modified) (1 diff)
• src/renderer/AgaviRenderer.class.php (modified) (1 diff)
• src/renderer/AgaviSmartyRenderer.class.php (modified) (1 diff)

branches/1.0/CHANGELOG

@@ -4 +4 @@
 1.0.0 beta 2 (August ??, 2008)
 ------------------------------
+
+ADD: Allow skipping of template auto-assigns (#605) (David)
 
 FIX: Some config handlers use PHP-5.3-reserved-word "NAMESPACE" as constant (#810) (David, Benjamin Börngen-Schmidt)

branches/1.0/src/renderer/AgaviEzctemplateRenderer.class.php

@@ -162 +162 @@
       if(isset($this->moreAssignNames[$key])) {
         $key = $this->moreAssignNames[$key];
+      } elseif(array_key_exists($key, $this->moreAssignNames)) {
+        // the name is null, which means this one should not be assigned
+        continue;
       }
       $engine->send->{$key} = $value;

branches/1.0/src/renderer/AgaviPhpRenderer.class.php

@@ -83 +83 @@
       if(isset($this->moreAssignNames[$moreAssignName])) {
         $moreAssignName = $this->moreAssignNames[$moreAssignName];
+      } elseif(array_key_exists($moreAssignName, $this->moreAssignNames)) {
+        // the name is null, which means this one should not be assigned
+        continue;
       }
       $this->moreAssigns[$moreAssignName] =& $moreAssign;

branches/1.0/src/renderer/AgaviPhptalRenderer.class.php

@@ -130 +130 @@
       if(isset($this->moreAssignNames[$key])) {
         $key = $this->moreAssignNames[$key];
+      } elseif(array_key_exists($key, $this->moreAssignNames)) {
+        // the name is null, which means this one should not be assigned
+        continue;
       }
       $engine->set($key, $value);

branches/1.0/src/renderer/AgaviRenderer.class.php

@@ -124 +124 @@
       $getter = 'get' . str_replace('_', '', $item);
       if(method_exists($this->context, $getter)) {
+        if($var === null) {
+          // the name is null, which means this one should not be assigned
+          // we do this in here, not for the moreAssignNames, since those are checked later in the renderer
+          continue;
+        }
         $this->assigns[$var] = $getter;
       } else {

branches/1.0/src/renderer/AgaviSmartyRenderer.class.php

@@ -158 +158 @@
       if(isset($this->moreAssignNames[$key])) {
         $key = $this->moreAssignNames[$key];
+      } elseif(array_key_exists($key, $this->moreAssignNames)) {
+        // the name is null, which means this one should not be assigned
+        continue;
       }
       $engine->assign_by_ref($key, $value);