Restructure the sort order to maintain the sort column and sort order

as two separate columns in the item table.

1 files changed, 5 insertions, 11 deletions

diff --git a/core/controllers/albums.php b/core/controllers/albums.php
index 96a6f401..2a55ecac 100644
--- a/core/controllers/albums.php
+++ b/core/controllers/albums.php
@@ -50,13 +50,11 @@ class Albums_Controller extends Items_Controller {
       url::redirect("albums/$album->id?page=$max_pages");
     }
 
-    $sort_order = $album->sort_column;
-    $sort_order = !empty($sort_order) ? unserialize($sort_order) : $sort_order;
-
     $template = new Theme_View("page.html", "album");
     $template->set_global("page_size", $page_size);
     $template->set_global("item", $album);
-    $template->set_global("children", $album->viewable()->children($page_size, $offset, $sort_order));
+    $template->set_global("children", $album->viewable()->children($page_size, $offset,
+                                                  array($album->sort_column => $album->sort_order)));
     $template->set_global("children_count", $children_count);
     $template->set_global("parents", $album->parents());
     $template->content = new View("album.html");
@@ -156,13 +154,9 @@ class Albums_Controller extends Items_Controller {
       $orig = clone $album;
       $album->title = $form->edit_album->title->value;
       $album->description = $form->edit_album->description->value;
-      $sort_column = $form->edit_album->sort_order->column->value;
-      if (!empty($sort_column)) {
-        $album->sort_column = serialize(array($sort_column =>
-                                              $form->edit_album->sort_order->direction->value));
-      } else {
-        $album->sort_column = null;
-      }
+      $album->sort_column = $form->edit_album->sort_order->column->value;
+      $album->sort_order = $form->edit_album->sort_order->direction->value;
+      
       $album->save();
 
       module::event("item_updated", $orig, $album);