Merge branch 'master' of git://github.com/gallery/gallery3

4 files changed, 8 insertions, 4 deletions

diff --git a/modules/gallery/controllers/admin_themes.php b/modules/gallery/controllers/admin_themes.php
index cd8a5530..9cdc3db5 100644
--- a/modules/gallery/controllers/admin_themes.php
+++ b/modules/gallery/controllers/admin_themes.php
@@ -25,6 +25,9 @@ class Admin_Themes_Controller extends Admin_Controller {
     $view->content->admin = module::get_var("gallery", "active_admin_theme");
     $view->content->site = module::get_var("gallery", "active_site_theme");
     $view->content->themes = $this->_get_themes();
+
+    site_status::clear("missing_site_theme");
+    site_status::clear("missing_admin_theme");
     print $view;
   }
 
diff --git a/modules/gallery/controllers/admin_upgrade_checker.php b/modules/gallery/controllers/admin_upgrade_checker.php
index a5cfcfc8..29d52a31 100644
--- a/modules/gallery/controllers/admin_upgrade_checker.php
+++ b/modules/gallery/controllers/admin_upgrade_checker.php
@@ -25,7 +25,7 @@ class Admin_Upgrade_Checker_Controller extends Admin_Controller {
     if ($message) {
       $message .= t(
         " <a href=\"%hide-url\"><i>(remind me later)</i></a>",
-        array("url" => url::site("admin/upgrade_checker/remind_me_later?csrf=__CSRF__")));
+        array("hide-url" => url::site("admin/upgrade_checker/remind_me_later?csrf=__CSRF__")));
       site_status::info($message, "upgrade_checker");
     } else {
       site_status::clear("upgrade_checker");
diff --git a/modules/gallery/controllers/login.php b/modules/gallery/controllers/login.php
index b203b7d3..fdf5d7b7 100644
--- a/modules/gallery/controllers/login.php
+++ b/modules/gallery/controllers/login.php
@@ -42,8 +42,9 @@ class Login_Controller extends Controller {
 
   public function html() {
     $view = new Theme_View("page.html", "other", "login");
-    $view->page_title = t("Login");
-    $view->content = auth::get_login_form("login/auth_html");
+    $view->page_title = t("Log in to Gallery");
+    $view->content = new View("login_ajax.html");
+    $view->content->form = auth::get_login_form("login/auth_html");
     print $view;
   }
 
diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php
index 17abc39f..da4768fd 100644
--- a/modules/gallery/controllers/quick.php
+++ b/modules/gallery/controllers/quick.php
@@ -38,7 +38,7 @@ class Quick_Controller extends Controller {
     if ($degrees) {
       $tmpfile = tempnam(TMPPATH, "rotate") . "." .
         pathinfo($item->file_path(), PATHINFO_EXTENSION);
-      gallery_graphics::rotate($item->file_path(), $tmpfile, array("degrees" => $degrees));
+      gallery_graphics::rotate($item->file_path(), $tmpfile, array("degrees" => $degrees), $item);
       $item->set_data_file($tmpfile);
       $item->save();
       unlink($tmpfile);