aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2009-05-06 21:09:06 +0000
committerplegall <plg@piwigo.org>2009-05-06 21:09:06 +0000
commite10636f2dbe9633fd887b4771692e5f71f2c44d4 (patch)
treeb3b6624be62d40d36eca38586feef5daa0c03e5a
parentef5224a9aa1085b0d0531e71cdf5ffeb199f3cf2 (diff)
merge r3276 from branch 2.0 to trunk
bug 968 fixed: charset is set in HTTP header. improvement: in the "this gallery is locked" message, the link to the "sign in" page is on the whole sentence, not only on the final dot. git-svn-id: http://piwigo.org/svn/trunk@3277 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/common.inc.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/common.inc.php b/include/common.inc.php
index 2cd761f9c..448d28ae1 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -181,8 +181,8 @@ if ($conf['gallery_locked'])
{
set_status_header(503, 'Service Unavailable');
@header('Retry-After: 900');
- echo l10n('gallery_locked_message')
- .'<a href="'.get_absolute_root_url(false).'identification.php">.</a>';
+ header('Content-Type: text/html; charset='.get_pwg_charset());
+ echo '<a href="'.get_absolute_root_url(false).'identification.php">'.l10n('gallery_locked_message').'</a>';
echo str_repeat( ' ', 512); //IE6 doesn't error output if below a size
exit();
}