summaryrefslogtreecommitdiff
path: root/modules/gallery/controllers/albums.php
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2009-09-23 07:04:59 -0700
committerTim Almdal <tnalmdal@shaw.ca>2009-09-23 07:04:59 -0700
commita24d9d67a6d6ee0b976068880476e69b432b1406 (patch)
tree4ec404fcb21117bfce0c54a96fc32422d79183fc /modules/gallery/controllers/albums.php
parent05275e2c07549ae9c40e647154fa442d796918b8 (diff)
parent7f066b34c9d965814c0a07a8f71e016edeb383d2 (diff)
Merge branch 'master' into talmdal_dev
Diffstat (limited to 'modules/gallery/controllers/albums.php')
-rw-r--r--modules/gallery/controllers/albums.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 3ea08538..694cc4ff 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -28,7 +28,9 @@ class Albums_Controller extends Items_Controller {
if ($album->id == 1) {
$view = new Theme_View("page.html", "login");
$view->page_title = t("Log in to Gallery");
- $view->content = user::get_login_form("login/auth_html");
+ //$view->content = user::get_login_form("login/auth_html");
+ $view->content = new View("login_ajax.html");
+ $view->content->form = user::get_login_form("login/auth_html");
print $view;
return;
} else {