]> git.andy128k.dev Git - ipf.git/commitdiff
add settings based context params unconditionally
authorAndrey Kutejko <andy128k@gmail.com>
Mon, 5 Jan 2015 00:12:34 +0000 (02:12 +0200)
committerAndrey Kutejko <andy128k@gmail.com>
Mon, 5 Jan 2015 00:12:34 +0000 (02:12 +0200)
ipf/project_template.php

index ca3f0ec1a5c9778fa0e51ebba4b7f8f8dbf3d3f3..eaf5cecaff77b78c7a7206ea7103c40b89f40dfa 100644 (file)
@@ -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);