diff options
author | Tim Almdal <tnalmdal@shaw.ca> | 2008-11-11 07:39:20 +0000 |
---|---|---|
committer | Tim Almdal <tnalmdal@shaw.ca> | 2008-11-11 07:39:20 +0000 |
commit | bba5289035eebb0c4a9c6c5f3d1598b538fc3586 (patch) | |
tree | cf0b00fca3c618e339cc3d1e92832b91b16f01be /core | |
parent | 87f1115113f36b197003a45f32f295bb4cd19891 (diff) |
Change Album and Photo controllers to set the user object as a global variable; change the header so it links to the user controllers; and add the user controllers which don't do anything.
Diffstat (limited to 'core')
-rw-r--r-- | core/controllers/album.php | 1 | ||||
-rw-r--r-- | core/controllers/photo.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/core/controllers/album.php b/core/controllers/album.php index 9357c986..63290853 100644 --- a/core/controllers/album.php +++ b/core/controllers/album.php @@ -34,6 +34,7 @@ class Album_Controller extends Item_Controller { $template->set_global('children', $item->children($page_size, ($page-1) * $page_size)); $template->set_global('parents', $item->parents()); $template->set_global('theme', $theme); + $template->set_global('user', Session::instance()->get('user', null)); $template->content = new View("album.html"); print $template->render(); diff --git a/core/controllers/photo.php b/core/controllers/photo.php index b56c29b9..78287afa 100644 --- a/core/controllers/photo.php +++ b/core/controllers/photo.php @@ -29,6 +29,7 @@ class Photo_Controller extends Item_Controller { $template->set_global('children', $item->children()); $template->set_global('parents', $item->parents()); $template->set_global('theme', $theme); + $template->set_global('user', Session::instance()->get('user', null)); $template->content = new View("photo.html"); print $template->render(); |