From ce05ce78e5727fa76e55874587eb07e3ae4e4c35 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Sat, 16 Apr 2011 17:52:10 +1200 Subject: [PATCH] BUGFIX Allow alternative (array-based) templates in Form->forTemplate() --- forms/Form.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/forms/Form.php b/forms/Form.php index 1ed29a32c..6394dd7bd 100755 --- a/forms/Form.php +++ b/forms/Form.php @@ -1101,9 +1101,9 @@ class Form extends RequestHandler { * than <% control FormObject %> */ function forTemplate() { - return $this->renderWith(array( - $this->getTemplate(), - 'Form' + return $this->renderWith(array_merge( + (array)$this->getTemplate(), + array('Form') )); }