From 6a5114174d269c56e0d9d6bc2e819cc00b6a0a3e Mon Sep 17 00:00:00 2001 From: Andrey Kutejko Date: Sat, 17 Aug 2013 23:37:40 +0300 Subject: [PATCH] more defaults for templates --- ipf/context.php | 22 ---------------------- ipf/project_template.php | 11 ++++++++++- 2 files changed, 10 insertions(+), 23 deletions(-) delete mode 100644 ipf/context.php diff --git a/ipf/context.php b/ipf/context.php deleted file mode 100644 index 1b014ae..0000000 --- a/ipf/context.php +++ /dev/null @@ -1,22 +0,0 @@ - $request->user); -} - -function IPF_Context_Media($request) -{ - return array('MEDIA_URL' => IPF::get('media_url')); -} - -function IPF_Context_Upload($request) -{ - return array('UPLOAD_URL' => IPF::getUploadUrl()); -} - -function IPF_Context_Current($request) -{ - return array('CURRENT_URL' => $request->query); -} - diff --git a/ipf/project_template.php b/ipf/project_template.php index 42d42fc..b336a8e 100644 --- a/ipf/project_template.php +++ b/ipf/project_template.php @@ -43,11 +43,20 @@ final class IPF_Project_Template public static function context($params=array(), $request=null) { if ($request) { - $params = array_merge(array('request' => $request), $params); + $params = array_merge(array( + 'request' => $request, + 'user' => $request->user, + 'STATIC_URL' => IPF::get('static_url'), + 'MEDIA_URL' => IPF::get('media_url'), + 'UPLOAD_URL' => IPF::getUploadUrl(), + 'CURRENT_URL' => $request->query, + ), $params); + foreach (IPF::get('template_context_processors', array()) as $proc) { $c = IPF::callFunction($proc, array($request)); $params = array_merge($c, $params); } + foreach (IPF_Project::getInstance()->appList() as $app) { $params = array_merge($app->templateContext($request), $params); } -- 2.49.0