X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fpage_header.php;h=2bc875069a79839dff551aa4976ab22349c5367d;hp=6b6663edb6df6eab77bb48d85a2d55faca4b00c7;hb=dae1f3e5f7dc0454a26535f7c3181c882ac146a3;hpb=e7db48afbf9565737173583af6962520d2491acc

diff --git a/functions/page_header.php b/functions/page_header.php
index 6b6663ed..2bc87506 100644
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -11,20 +11,7 @@
        return;
    define('page_header_php', true);
 
-   include('../src/validate.php');
-   include("../functions/prefs.php");
-   include("../functions/plugin.php");
-
-   // Check to see if gettext is installed
-   $headers_sent=set_up_language(getPref($data_dir, $username, "language"));
-
-   // This is done to ensure that the character set is correct.
-   // But first checks whether we have already sent headers
-   // with charset when we were setting up the user language.
-   // Otherwise user ends up with the default charset overriding
-   // his selected one.
-   if (!$headers_sent && $default_charset != "")
-      header ("Content-Type: text/html; charset=$default_charset");
+   // Always set up the language before calling these functions
 
    function displayHtmlHeader ($title="SquirrelMail") {
      global $theme_css;