let Template&addContext() take another template instance

sparkfun · Oct 28, 2012 · 220a2b6 · 220a2b6
1 parent f7a2d4b
commit 220a2b6
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/Template.php b/Template.php
@@ -134,6 +134,9 @@ public function setContext ($context = array())
    */
   public function addContext ($context = array())
   {
+    if ($context instanceof Template)
+      $context = $template->getContext();
+
     foreach ($context as $key => $val) {
       $this->__set($key, $val);
     }