summaryrefslogtreecommitdiff
path: root/core/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'core/controllers')
-rw-r--r--core/controllers/albums.php5
-rw-r--r--core/controllers/photos.php5
2 files changed, 5 insertions, 5 deletions
diff --git a/core/controllers/albums.php b/core/controllers/albums.php
index 1977003b..48cbe410 100644
--- a/core/controllers/albums.php
+++ b/core/controllers/albums.php
@@ -27,9 +27,8 @@ class Albums_Controller extends Items_Controller {
return Kohana::show_404();
}
- // @todo: these need to be pulled from the database
- $theme_name = "default";
- $page_size = 9;
+ $theme_name = module::get_var("core", "active_theme", "default");
+ $page_size = module::set_var("core", "page_size", 9);
$template = new Theme_View("page.html", "album", $theme_name);
diff --git a/core/controllers/photos.php b/core/controllers/photos.php
index c72fae12..5159d66f 100644
--- a/core/controllers/photos.php
+++ b/core/controllers/photos.php
@@ -27,8 +27,9 @@ class Photos_Controller extends Items_Controller {
return Kohana::show_404();
}
- // @todo: this needs to be data-driven
- $template = new Theme_View("page.html", "photo", "default");
+ $theme_name = module::get_var("core", "active_theme", "default");
+
+ $template = new Theme_View("page.html", "photo", $theme_name);
$template->set_global('item', $item);
$template->set_global('children', $item->children());