From 7e05041c2c5541c070821236dc3bbe5a3cd9344d Mon Sep 17 00:00:00 2001 From: Andrey Kutejko Date: Sun, 4 Jan 2015 12:44:08 +0200 Subject: [PATCH] add indexpage_url to template defaults --- ipf.php | 1 + ipf/admin/app.php | 1 - ipf/project_template.php | 13 +++++++------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ipf.php b/ipf.php index 3304c69..2551a15 100644 --- a/ipf.php +++ b/ipf.php @@ -47,6 +47,7 @@ final class IPF ->apply(array( 'app_base' => '', 'debug' => false, + 'indexpage_url' => '/', 'media_url' => '/media/', 'upload_url' => '/media/upload/', 'static_url' => '/static/', diff --git a/ipf/admin/app.php b/ipf/admin/app.php index 9c3730a..e6c5904 100644 --- a/ipf/admin/app.php +++ b/ipf/admin/app.php @@ -60,7 +60,6 @@ class IPF_Admin_App extends IPF_Application return array( 'IPF_VER' => IPF::version(), 'admin_title' => IPF::get('admin_title'), - 'indexpage_url' => IPF::get('indexpage_url', '/'), 'app_list' => F::bind(array($this, 'appList'), $request), ); } diff --git a/ipf/project_template.php b/ipf/project_template.php index f7a82de..5743b0e 100644 --- a/ipf/project_template.php +++ b/ipf/project_template.php @@ -52,12 +52,13 @@ final class IPF_Project_Template { if ($request) { $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, + '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); foreach (IPF::get('template_context_processors', array()) as $proc) { -- 2.49.0