diff options
author | Bharat Mediratta <bharat@menalto.com> | 2010-11-14 15:48:20 -0800 |
---|---|---|
committer | Bharat Mediratta <bharat@menalto.com> | 2010-11-14 15:48:20 -0800 |
commit | bf333aa762e061cf655c7c571e9ce5f8b721ba72 (patch) | |
tree | 3c0ba3d0ea21aacd415f3043fcbaca9e4d43e925 | |
parent | d49a6dcc995d0c0073b3173d81cac7f3eb6ee30f (diff) | |
parent | 86790d4464c9f79e90adbe2cc7c24251371ad416 (diff) |
Merge branch 'master' of github.com:gallery/gallery3
-rw-r--r-- | modules/gallery/helpers/gallery_theme.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php index 0d7cc44a..978c69a6 100644 --- a/modules/gallery/helpers/gallery_theme.php +++ b/modules/gallery/helpers/gallery_theme.php @@ -93,7 +93,7 @@ class gallery_theme_Core { } // Redirect to the root album when the admin session expires. - $admin_session_redirect_check = '<script type="text/javascript"> + $content = '<script type="text/javascript"> var adminReauthCheck = function() { $.ajax({url: "' . url::site("admin?reauth_check=1") . '", dataType: "json", @@ -105,11 +105,11 @@ class gallery_theme_Core { }; setInterval("adminReauthCheck();", 60 * 1000); </script>'; - print $admin_session_redirect_check; if ($session->get("l10n_mode", false)) { - return L10n_Client_Controller::l10n_form(); + $content .= "\n" . L10n_Client_Controller::l10n_form(); } + return $content; } static function credits() { |