diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/controllers/albums.php | 8 | ||||
| -rw-r--r-- | core/helpers/album.php | 10 | ||||
| -rw-r--r-- | core/helpers/core_installer.php | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/core/controllers/albums.php b/core/controllers/albums.php index ea5fc860..2c7ea83b 100644 --- a/core/controllers/albums.php +++ b/core/controllers/albums.php @@ -51,10 +51,7 @@ class Albums_Controller extends Items_Controller { } $sort_order = $album->sort_column; - if (!empty($sort_order)) { - list ($sort_column, $sort_direction) = explode(" ", $sort_order); - $sort_order = array($sort_column => $sort_direction); - } + $sort_order = !empty($sort_order) ? unserialize($sort_order) : $sort_order; $template = new Theme_View("page.html", "album"); $template->set_global("page_size", $page_size); @@ -161,7 +158,8 @@ class Albums_Controller extends Items_Controller { $album->description = $form->edit_album->description->value; $sort_column = $form->edit_album->sort_order->column->value; if (!empty($sort_column)) { - $album->sort_column = $sort_column . " " . $form->edit_album->sort_order->direction->value; + $album->sort_column = serialize(array($sort_column => + $form->edit_album->sort_order->direction->value)); } else { $album->sort_column = null; } diff --git a/core/helpers/album.php b/core/helpers/album.php index d93840c1..72008cd5 100644 --- a/core/helpers/album.php +++ b/core/helpers/album.php @@ -87,8 +87,12 @@ class album_Core { $group->textarea("description")->label(t("Description"))->value($parent->description); $sort_order = $group->group("sort_order", array("id" => "gAlbumSortOrder")) ->label(t("Sort Order")); - if (empty($parent->sort_order)) { - list ($sort_column, $sort_direction) = explode(" ", $parent->sort_column); + $sort_column = $parent->sort_column; + if (!empty($sort_column)) { + $sort_column = unserialize($sort_column); + $columns = array_keys($sort_column); + $sort_direction = $sort_column[$columns[0]]; + $sort_column = $columns[0]; } else { list ($sort_column, $sort_direction) = array("", "ASC"); } @@ -96,9 +100,7 @@ class album_Core { ->label(t("Sort by")) ->options(array("" => t("select a column"), "created" => t("Creation Date"), - "mime_type" => t("Mime Type"), "title" => t("Title"), - "type" => t("Type"), "updated" => t("Updated Date"), "view_count" => t("Number of views"), "rand_key" => t("Random"))) diff --git a/core/helpers/core_installer.php b/core/helpers/core_installer.php index 3a1013e0..06cd8d91 100644 --- a/core/helpers/core_installer.php +++ b/core/helpers/core_installer.php @@ -78,7 +78,7 @@ class core_installer { `view_count` int(9) default 0, `width` int(9) default NULL, `rand_key` float default NULL, - `sort_column` varchar(255) default NULL, + `sort_column` varchar(64) default NULL, PRIMARY KEY (`id`), KEY `parent_id` (`parent_id`), KEY `type` (`type`), |