From: Andrey Kutejko <andy128k@gmail.com>
Date: Mon, 5 Jan 2015 00:12:34 +0000 (+0200)
Subject: add settings based context params unconditionally
X-Git-Tag: 0.6~92
X-Git-Url: https://git.andy128k.dev/?a=commitdiff_plain;h=bd0cb60364dbc11679a4b5a4a30a8a092721b93f;p=ipf.git

add settings based context params unconditionally
---

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);