From a9606c1dfe861b72cb2d2e459dfaf82170661fe6 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Thu, 26 Jun 2008 10:38:36 -0400 Subject: [PATCH] Update the framework to take advantage of global template variables when processing templates in global.php --- global.php | 10 ++++++---- includes/framework | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/global.php b/global.php index 76fcbbf..d6c9798 100755 --- a/global.php +++ b/global.php @@ -71,10 +71,12 @@ if (!(defined('NO_TEMPLATES') AND constant('NO_TEMPLATES') == true)) BSApp::debug('time for tpl cache: ' . BSFunctions::fetch_microtime_diff($start)); - $header = BSTemplate::fetch('header')->evaluate(); - $doctype = BSTemplate::fetch('doctype')->evaluate(); - $headinclude = BSTemplate::fetch('headinclude')->evaluate(); - $footer = BSTemplate::fetch('footer')->evaluate(); + BSTemplate::$globalVars = array( + 'header' => BSTemplate::fetch('header')->evaluate()->getTemplate(), + 'doctype' => BSTemplate::fetch('doctype')->evaluate()->getTemplate(), + 'headinclude' => BSTemplate::fetch('headinclude')->evaluate()->getTemplate(), + 'footer' => BSTemplate::fetch('footer')->evaluate()->getTemplate() + ); } // ################################################################### diff --git a/includes/framework b/includes/framework index e240cb2..0122685 160000 --- a/includes/framework +++ b/includes/framework @@ -1 +1 @@ -Subproject commit e240cb20108fed1cca640316640eb84015a756a6 +Subproject commit 012268591bbf9b294ee97bf7f824e22a50c803de -- 2.22.5