Permalink
Browse files

Merging from MOODLE_15_STABLE

- adding charset to header
  • Loading branch information...
1 parent 10c8362 commit 7237be41af5c2a849f69cb474d79d0d92a882de2 julmis committed Oct 1, 2005
Showing with 7 additions and 5 deletions.
  1. +3 −2 lib/editor/htmlarea.php
  2. +2 −1 lib/editor/lang/en.php
  3. +2 −2 lib/editor/popups/fullscreen.php
View
@@ -8,7 +8,8 @@
ob_start("ob_gzhandler");
}
- header("Content-type: application/x-javascript"); // Correct MIME type
+ $charset = get_string('thischarset');
+ header("Content-type: application/x-javascript; charset: $charset"); // Correct MIME type
header("Last-Modified: " . gmdate("D, d M Y H:i:s", $lastmodified) . " GMT");
header("Expires: " . gmdate("D, d M Y H:i:s", time() + $lifetime) . " GMT");
header("Cache-control: max_age = $lifetime");
@@ -678,7 +679,7 @@ function createButton(txt) {
html += '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\n';
html += "<html>\n";
html += "<head>\n";
- html += '<meta http-equiv="content-type" content="text/html; charset=<?php print_string("thischarset");?>" />\n';
+ html += '<meta http-equiv="content-type" content="text/html; charset=<?php echo $charset; ?>" />\n';
if (editor.config.baseURL)
html += '<base href="' + editor.config.baseURL + '" />';
html += '<style type="text/css">\n' + editor.config.pageStyle + "td { border: 1px dotted gray; }</style>\n";
View
@@ -7,7 +7,8 @@
ob_start("ob_gzhandler");
}
- header("Content-type: application/x-javascript"); // Correct MIME type
+ $charset = get_string('thischarset');
+ header("Content-type: application/x-javascript; charset: $charset"); // Correct MIME type
header("Last-Modified: " . gmdate("D, d M Y H:i:s", $lastmodified) . " GMT");
header("Expires: " . gmdate("D, d M Y H:i:s", time() + $lifetime) . " GMT");
// See Bug #2387
@@ -15,8 +15,8 @@
html, body { margin: 0px; border: 0px; background-color: buttonface; } </style>
-<script type="text/javascript" src="../htmlarea.php?id=<?php p($id); ?>" charset="<?php print_string('thischarset'); ?>"></script>
-<script type="text/javascript" src="../lang/en.php" charset="<?php print_string('thischarset'); ?>"></script>
+<script type="text/javascript" src="../htmlarea.php?id=<?php p($id); ?>"></script>
+<script type="text/javascript" src="../lang/en.php"></script>
<script type="text/javascript" src="../dialog.js" charset="<?php print_string('thischarset'); ?>"></script>
<script type="text/javascript" src="../plugins/TableOperations/table-operations.js" charset="<?php print_string('thischarset'); ?>"></script>
<script type="text/javascript" src="../plugins/TableOperations/lang/en.js" charset="<?php print_string('thischarset'); ?>"></script>

0 comments on commit 7237be4

Please sign in to comment.