Merge branch 'master' into talmdal_dev

1 files changed, 2 insertions, 1 deletions

diff --git a/modules/gallery/controllers/admin_theme_options.php b/modules/gallery/controllers/admin_theme_options.php
index 9de54c78..6297e4aa 100644
--- a/modules/gallery/controllers/admin_theme_options.php
+++ b/modules/gallery/controllers/admin_theme_options.php
@@ -64,7 +64,8 @@ class Admin_Theme_Options_Controller extends Admin_Controller {
       url::redirect("admin/theme_options");
     } else {
       $view = new Admin_View("admin.html");
-      $view->content = $form;
+      $view->content = new View("admin_theme_options.html");
+      $view->content->form = $form;
       print $view;
     }
   }