Merge branch 'master' into talmdal_dev

Conflicts:
	modules/gallery/controllers/albums.php
	modules/gallery/controllers/movies.php
	modules/gallery/controllers/photos.php

1 files changed, 3 insertions, 2 deletions

diff --git a/modules/forge/libraries/Forge.php b/modules/forge/libraries/Forge.php
index d9da4c7d..5807c849 100644
--- a/modules/forge/libraries/Forge.php
+++ b/modules/forge/libraries/Forge.php
@@ -277,7 +277,8 @@ class Forge_Core {
 			{
 				foreach ($this->hidden as $input)
 				{
-					$hidden[$input->name] = $input->value;
+					$hidden['name'] = $input->name;
+					$hidden['value'] = $input->value;
 				}
 			}
 
@@ -299,7 +300,7 @@ class Forge_Core {
 
 			// Set the form open and close
 			$form->open  = form::$form_type(arr::remove('action', $this->attr), $this->attr, $hidden);
-			$form->close = form::close();
+			$form->close = "</form>";
 
 			// Set the inputs
 			$form->inputs = $this->inputs;