From ca47b887f5bb8ad311c4ab7e4c71aace37ba88e9 Mon Sep 17 00:00:00 2001
From: colings <colings@example.com>
Date: Wed, 23 Feb 2011 20:31:07 -0600
Subject: Added extra arg to gallery_graphics calls and updated users

---
 modules/gallery/controllers/quick.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/gallery/controllers')

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);
-- 
cgit v1.2.3


From 3fd7debd2f5d3e05ffd23d0e1f90119ff50c001b Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 15 Mar 2011 00:53:35 -0700
Subject: Fix a bug where the placeholder %hide-url didn't match the variable
 in the assoc. array.  Follow on for #1624

---
 modules/gallery/controllers/admin_upgrade_checker.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/gallery/controllers')

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");
-- 
cgit v1.2.3


From 1d0f4b7a430e6c7d8d715a42fb391b8e1afbdf19 Mon Sep 17 00:00:00 2001
From: Andy Lindeman <alindeman@gmail.com>
Date: Sun, 3 Apr 2011 15:44:28 -0500
Subject: [Fixes #1574] Render the login form in the same way in every action

This makes sure the "Forgot Your Password?" link appears when the HTML form
is initially rendered.
---
 modules/gallery/controllers/login.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'modules/gallery/controllers')

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;
   }
 
-- 
cgit v1.2.3


From deb7db6486988ce3e41b2fffd010487fbb67a91f Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 22 Apr 2011 09:29:25 -0700
Subject: Clear the site status for missing themes when we view this page -- if
 something goes wrong we'll just add it back again anyway.  Follow-on for
 #1655.

---
 modules/gallery/controllers/admin_themes.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'modules/gallery/controllers')

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;
   }
 
-- 
cgit v1.2.3