Merge branch 'master' into talmdal_dev

2 files changed, 2 insertions, 3 deletions

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 694cc4ff..9733d1cd 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -28,7 +28,6 @@ class Albums_Controller extends Items_Controller {
       if ($album->id == 1) {
         $view = new Theme_View("page.html", "login");
         $view->page_title = t("Log in to Gallery");
-        //$view->content = user::get_login_form("login/auth_html");
         $view->content = new View("login_ajax.html");
         $view->content->form = user::get_login_form("login/auth_html");
         print $view;
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index fa07668e..2a917c58 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -60,7 +60,7 @@ class Movies_Controller extends Items_Controller {
     access::required("view", $movie);
     access::required("edit", $movie);
 
-    $form = photo::get_edit_form($movie);
+    $form = movie::get_edit_form($movie);
     if ($valid = $form->validate()) {
       if ($form->edit_item->filename->value != $movie->name ||
           $form->edit_item->slug->value != $movie->slug) {
@@ -114,6 +114,6 @@ class Movies_Controller extends Items_Controller {
   public function _form_edit($movie) {
     access::required("view", $movie);
     access::required("edit", $movie);
-    print photo::get_edit_form($movie);
+    print movie::get_edit_form($movie);
   }
 }