add indexpage_url to template defaults

diff --git a/ipf.php b/ipf.php
index 3304c6971a8e734ef19276783514e24f604b8cd5..2551a1571914061f75342571dc7acebf16e6c540 100644 (file)
--- 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 9c3730a81fc67229c5b8bb970ba656ba7c9f5ba8..e6c5904e6a4b3641a95711e20de8dfe19ecc8bc1 100644 (file)
--- 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 f7a82de0e1b1f3c36bdade2756d92008c3d0ca12..5743b0e4d6216510e59d1972bac8306875830694 100644 (file)
--- 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) {