From 6e5ec75b55ab6a87aa4ef9416c21f8a2c9685f0f Mon Sep 17 00:00:00 2001
From: Deon George <wurley@users.sf.net>
Date: Wed, 27 Apr 2011 00:02:05 +1000
Subject: [PATCH] SF Bug #3077852 - Default template being used after
 modificaiton of entry

---
 htdocs/add_attr_form.php      | 2 +-
 htdocs/add_oclass_form.php    | 2 +-
 htdocs/add_value_form.php     | 2 +-
 htdocs/modify_member_form.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/add_attr_form.php b/htdocs/add_attr_form.php
index 763349e..dda6edc 100644
--- a/htdocs/add_attr_form.php
+++ b/htdocs/add_attr_form.php
@@ -19,7 +19,7 @@ $request['dn'] = get_request('dn','GET');
 if (! $request['dn'] || ! $app['server']->dnExists($request['dn']))
 	error(sprintf(_('The entry (%s) does not exist.'),$request['dn']),'error','index.php');
 
-$request['page'] = new TemplateRender($app['server']->getIndex(),get_request('template','REQUEST',false,'none'));
+$request['page'] = new TemplateRender($app['server']->getIndex(),get_request('template','REQUEST',false,null));
 $request['page']->setDN($request['dn']);
 $request['page']->accept(true);
 $request['template'] = $request['page']->getTemplate();
diff --git a/htdocs/add_oclass_form.php b/htdocs/add_oclass_form.php
index ce1fa22..d2353c9 100644
--- a/htdocs/add_oclass_form.php
+++ b/htdocs/add_oclass_form.php
@@ -23,7 +23,7 @@ $request['dn'] = get_request('dn','REQUEST',true);
 if (! $request['dn'] || ! $app['server']->dnExists($request['dn']))
 	error(sprintf(_('The entry (%s) does not exist.'),$request['dn']),'error','index.php');
 
-$request['page'] = new TemplateRender($app['server']->getIndex(),get_request('template','REQUEST',false,'none'));
+$request['page'] = new TemplateRender($app['server']->getIndex(),get_request('template','REQUEST',false,null));
 $request['page']->setDN($request['dn']);
 $request['page']->accept(true);
 $request['template'] = $request['page']->getTemplate();
diff --git a/htdocs/add_value_form.php b/htdocs/add_value_form.php
index f4c070e..790b639 100644
--- a/htdocs/add_value_form.php
+++ b/htdocs/add_value_form.php
@@ -21,7 +21,7 @@ $request['attr'] = get_request('attr','GET',true);
 if (! $request['dn'] || ! $app['server']->dnExists($request['dn']))
 	error(sprintf(_('The entry (%s) does not exist.'),$request['dn']),'error','index.php');
 
-$request['page'] = new TemplateRender($app['server']->getIndex(),get_request('template','REQUEST',false,'none'));
+$request['page'] = new TemplateRender($app['server']->getIndex(),get_request('template','REQUEST',false,null));
 $request['page']->setDN($request['dn']);
 $request['page']->accept(true);
 $request['template'] = $request['page']->getTemplate();
diff --git a/htdocs/modify_member_form.php b/htdocs/modify_member_form.php
index aae0827..208b9ef 100644
--- a/htdocs/modify_member_form.php
+++ b/htdocs/modify_member_form.php
@@ -16,7 +16,7 @@ $request = array();
 $request['dn'] = get_request('dn','GET');
 $request['attr'] = get_request('attr','GET');
 
-$request['page'] = new TemplateRender($app['server']->getIndex(),get_request('template','REQUEST',false,'none'));
+$request['page'] = new TemplateRender($app['server']->getIndex(),get_request('template','REQUEST',false,null));
 $request['page']->setDN($request['dn']);
 $request['page']->accept(true);
 $request['template'] = $request['page']->getTemplate();