From 3ace768e5015bd7d43e8558118676b73ba8cbd51 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 4 Sep 2005 13:52:08 +0000
Subject: [PATCH] - Patch by Rober: better fix for the extract() namespace
problem in phptemplate.engine.
---
themes/engines/phptemplate/phptemplate.engine | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/themes/engines/phptemplate/phptemplate.engine b/themes/engines/phptemplate/phptemplate.engine
index b58d9dcb9998..37a4b315d5ce 100644
--- a/themes/engines/phptemplate/phptemplate.engine
+++ b/themes/engines/phptemplate/phptemplate.engine
@@ -331,13 +331,12 @@ function _phptemplate_default($hook, $variables, $file = NULL) {
}
if ($file) {
- unset($variables['file']); // Make sure we don't override $file
- extract($variables); // Extract the vars to local namespace
- ob_start(); // Start output buffering
- include($file); // Include the file
- $contents = ob_get_contents(); // Get the contents of the buffer
- ob_end_clean(); // End buffering and discard
- return $contents; // Return the contents
+ extract($variables, EXTR_SKIP); // Extract the vars to local namespace
+ ob_start(); // Start output buffering
+ include($file); // Include the file
+ $contents = ob_get_contents(); // Get the contents of the buffer
+ ob_end_clean(); // End buffering and discard
+ return $contents; // Return the contents
}
}
--
GitLab