diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gallery/controllers/file_proxy.php | 7 | ||||
| -rw-r--r-- | modules/organize/controllers/organize.php | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/modules/gallery/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php index a9e98ce1..7e5d0038 100644 --- a/modules/gallery/controllers/file_proxy.php +++ b/modules/gallery/controllers/file_proxy.php @@ -129,6 +129,13 @@ class File_Proxy_Controller extends Controller { throw $e; } + if (gallery::show_profiler()) { + Profiler::enable(); + $profiler = new Profiler(); + $profiler->render(); + exit; + } + header("Content-Length: " . filesize($file)); header("Pragma:"); diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php index 37920020..9e5bce84 100644 --- a/modules/organize/controllers/organize.php +++ b/modules/organize/controllers/organize.php @@ -128,6 +128,8 @@ class Organize_Controller extends Controller { access::required("edit", $album); if ($album->sort_column != "weight") { + // Force all the weights into the current order before changing the order to manual + // @todo: consider making this a trigger in the Item_Model. item::resequence_child_weights($album); $album->sort_column = "weight"; $album->sort_order = "ASC"; |