From bd0cb60364dbc11679a4b5a4a30a8a092721b93f Mon Sep 17 00:00:00 2001 From: Andrey Kutejko Date: Mon, 5 Jan 2015 02:12:34 +0200 Subject: [PATCH] add settings based context params unconditionally --- ipf/project_template.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ipf/project_template.php b/ipf/project_template.php index ca3f0ec..eaf5cec 100644 --- a/ipf/project_template.php +++ b/ipf/project_template.php @@ -21,14 +21,17 @@ final class IPF_Project_Template public static function context($params=array(), $request=null) { + $params = array_merge(array( + 'indexpage_url' => IPF::get('indexpage_url'), + 'STATIC_URL' => IPF::get('static_url'), + 'MEDIA_URL' => IPF::get('media_url'), + 'UPLOAD_URL' => IPF::getUploadUrl(), + ), $params); + if ($request) { $params = array_merge(array( 'request' => $request, 'user' => $request->user, - 'indexpage_url' => IPF::get('indexpage_url'), - 'STATIC_URL' => IPF::get('static_url'), - 'MEDIA_URL' => IPF::get('media_url'), - 'UPLOAD_URL' => IPF::getUploadUrl(), 'CURRENT_URL' => $request->query, ), $params); -- 2.49.0