diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-08-07 12:37:25 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-08-07 12:37:25 -0700 |
| commit | 63ddac5d018af3933ac820672de530c34074319e (patch) | |
| tree | 6e1f0f5413290d26d1c4c3e6bb0504ff53803b6d /modules/user/helpers/user_theme.php | |
| parent | c09e2ef7af5411f239ba7f1adb01be39b2950b84 (diff) | |
| parent | e4eec71efa5f7b1902155a34f8655cebe523c358 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_branch
Conflicts:
themes/default/js/ui.init.js
Diffstat (limited to 'modules/user/helpers/user_theme.php')
| -rw-r--r-- | modules/user/helpers/user_theme.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/modules/user/helpers/user_theme.php b/modules/user/helpers/user_theme.php index 69042aed..8de2d248 100644 --- a/modules/user/helpers/user_theme.php +++ b/modules/user/helpers/user_theme.php @@ -19,8 +19,10 @@ */ class user_theme_Core { static function header_top($theme) { - $view = new View("login.html"); - $view->user = user::active(); - return $view->render(); + if ($theme->page_type != "login") { + $view = new View("login.html"); + $view->user = user::active(); + return $view->render(); + } } } |