From cb3d619b06ce8c72e5e69d3a3d360ef5b759e3b1 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Mon, 26 Oct 2009 11:37:03 -0700 Subject: When we are changing the password using the change password from as part of the password reset, the input value is in the post[hash] variable as opposed to the get(key) value. This should fix ticket #850. --- modules/user/controllers/password.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php index e8b08960..f669b2c4 100644 --- a/modules/user/controllers/password.php +++ b/modules/user/controllers/password.php @@ -116,7 +116,7 @@ class Password_Controller extends Controller { private function _change_password() { $view = $this->_new_password_form(); if ($view->content->validate()) { - $user = user::lookup_by_hash(Input::instance()->get("key")); + $user = user::lookup_by_hash(Input::instance()->post("hash")); if (empty($user)) { throw new Exception("@todo FORBIDDEN", 503); } -- cgit v1.2.3 From e496e5f6bfa943a0f7e663c94d97bf071f61153d Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Mon, 26 Oct 2009 14:32:04 -0700 Subject: When rebuilding dirty images, start a batch on initialization and stop it when the task is complete. Fixes ticket #670 --- modules/gallery/helpers/gallery_task.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/gallery/helpers/gallery_task.php b/modules/gallery/helpers/gallery_task.php index 1ff26c35..95216cf0 100644 --- a/modules/gallery/helpers/gallery_task.php +++ b/modules/gallery/helpers/gallery_task.php @@ -52,7 +52,8 @@ class gallery_task_Core { $mode = $task->get("mode", "init"); if ($mode == "init") { $task->set("total_count", $total_count); - $task->get("mode", "process"); + $task->set("mode", "process"); + batch::start(); } $completed = $task->get("completed", 0); @@ -101,6 +102,7 @@ class gallery_task_Core { if ($task->percent_complete == 100) { $task->done = true; $task->state = "success"; + batch::stop(); site_status::clear("graphics_dirty"); } } catch (Exception $e) { -- cgit v1.2.3 From 03caee07b44f35c57efec6e61ce9d67a573cc1f3 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Mon, 26 Oct 2009 21:42:15 -0600 Subject: This should have been included in a1847df83bfddf350fc71fd0e0e1c054bc94ce2d --- themes/admin_wind/css/fix-ie.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/themes/admin_wind/css/fix-ie.css b/themes/admin_wind/css/fix-ie.css index 99fc6241..5475cb79 100644 --- a/themes/admin_wind/css/fix-ie.css +++ b/themes/admin_wind/css/fix-ie.css @@ -9,3 +9,10 @@ .g-unavailable:hover { filter: alpha(opacity=100); } + +tr.g-error td, +tr.g-info td, +tr.g-success td, +tr.g-warning td { + background: none !important; +} -- cgit v1.2.3 From ccb18753cfe5b65d411e91d7f9dda29308088aba Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Mon, 26 Oct 2009 22:07:14 -0600 Subject: Removed g-progress-bar, it's now in gallery.common. --- themes/admin_wind/css/screen.css | 7 ------- 1 file changed, 7 deletions(-) diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index 13174df9..19da5a4b 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -478,13 +478,6 @@ th { /*************** STUFF THAT NEEDS A HOME ****************/ -.g-progress-bar { - height: 1em; - width: 100%; - margin-top: .5em; - display: inline-block; -} - #g-task-log-dialog h1 { font-size: 1.1em; } -- cgit v1.2.3 From 3aedd95341450e3bc4f9040c76d5616ad5e54c05 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Mon, 26 Oct 2009 22:53:51 -0600 Subject: Correct tag admin list markup that I likely hacked up during recent commits. These HTML lists now validate. --- modules/tag/views/admin_tags.html.php | 50 +++++++++++++++++------------------ 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php index 3e333817..10d7921a 100644 --- a/modules/tag/views/admin_tags.html.php +++ b/modules/tag/views/admin_tags.html.php @@ -28,34 +28,32 @@ - $tag): ?> - name, 0, 1)) ?> + $tag): ?> + name, 0, 1)) ?> - - -
    - - $tags_per_column): /* new column */ ?> - - - - -
- -