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
Piwigo · May 6, 2009 · e10636f · e10636f
1 parent ef5224a
commit e10636f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/include/common.inc.php b/include/common.inc.php
@@ -181,8 +181,8 @@ function sanitize_mysql_kv(&$v, $k)
   {
     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();
   }