Merge pull request #4445 from WoltLab/template-sandbox-foreachvars

Sandbox `foreachVars` in templates
WoltLab · Aug 9, 2021 · e738b4a · e738b4a
2 parents 87107e0 + 939a258
commit e738b4a
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php b/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php
@@ -543,7 +543,10 @@ public function getPluginClassName($type, $tag)
     public function enableSandbox()
     {
         $index = \count($this->sandboxVars);
-        $this->sandboxVars[$index] = $this->v;
+        $this->sandboxVars[$index] = [
+            'foreachVars' => $this->foreachVars,
+            'v' => $this->v,
+        ];
     }
 
     /**
@@ -555,7 +558,9 @@ public function disableSandbox()
             throw new SystemException('TemplateEngine is currently not running in a sandbox.');
         }
 
-        $this->v = \array_pop($this->sandboxVars);
+        $values = \array_pop($this->sandboxVars);
+        $this->foreachVars = $values['foreachVars'];
+        $this->v = $values['v'];
     }
 
     /**