From 5718f9ecd86e3a280bb568c6f8bbab4dd1c0901c Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Thu, 26 Jun 2008 10:34:07 -0400
Subject: [PATCH] Revert "We were hitting an infinite loop with
isso_pre_parse_hook"
This reverts commit 7fd25a7d3575c41051430d4611278d22cc6a98cd.
---
includes/functions.php | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/includes/functions.php b/includes/functions.php
index 3a46bf9..aec184a 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -537,18 +537,14 @@ function fetch_on_bits($mask, $userinfo = null)
// the pre-parse hook for ISSO's template engine
function isso_pre_parse_hook($template, $obj)
{
- static $gotGlobals = false;
+ $globals = array(
+ 'header' => BSTemplate::fetch('header')->evaluate(),
+ 'doctype' => BSTemplate::fetch('doctype')->evaluate(),
+ 'headinclude' => BSTemplate::fetch('headinclude')->evaluate(),
+ 'footer' => BSTemplate::fetch('footer')->evaluate()
+ );
- if (!$gotGlobals)
- {
- $gotGlobals = true;
- $globals = array(
- 'header' => BSTemplate::fetch('header')->evaluate(),
- 'doctype' => BSTemplate::fetch('doctype')->evaluate(),
- 'headinclude' => BSTemplate::fetch('headinclude')->evaluate(),
- 'footer' => BSTemplate::fetch('footer')->evaluate()
- );
- }
+ print_r($globals);
$obj->vars = array_merge($globals, $obj->vars);
--
2.43.5