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
This commit is contained in:
plegall
2009-05-06 21:09:06 +00:00
parent ef5224a9aa
commit e10636f2db
+2 -2
View File
@@ -181,8 +181,8 @@ if ($conf['gallery_locked'])
{ {
set_status_header(503, 'Service Unavailable'); set_status_header(503, 'Service Unavailable');
@header('Retry-After: 900'); @header('Retry-After: 900');
echo l10n('gallery_locked_message') header('Content-Type: text/html; charset='.get_pwg_charset());
.'<a href="'.get_absolute_root_url(false).'identification.php">.</a>'; 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 echo str_repeat( ' ', 512); //IE6 doesn't error output if below a size
exit(); exit();
} }