Commit 3ace768e authored by Dries's avatar Dries
Browse files

- Patch by Rober: better fix for the extract() namespace problem in phptemplate.engine.

parent 0094e99b
......@@ -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
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment