cvs: phpweb /include layout.inc prepend.inc
| From: | Rasmus Lerdorf | Date: | Tue, 28 Feb 2006 16:49:54 +0000 |
| Subject: | cvs: phpweb /include layout.inc prepend.inc | ||
| Groups: | php.mirrors | ||
| Request: | Send a blank email to php-mirrors+get-30727@lists.php.net to get a copy of this message | ||
rasmus Tue Feb 28 16:49:54 2006 UTC
Modified files:
/phpweb/include layout.inc prepend.inc
Log:
Default to utf-8 instead of 8859-1
http://cvs.php.net/viewcvs.cgi/phpweb/include/layout.inc?r1=1.231&r2=1.232&diff_format=u
Index: phpweb/include/layout.inc
diff -u phpweb/include/layout.inc:1.231 phpweb/include/layout.inc:1.232
--- phpweb/include/layout.inc:1.231 Tue Feb 28 12:15:47 2006
+++ phpweb/include/layout.inc Tue Feb 28 16:49:54 2006
@@ -1,5 +1,5 @@
<?php
-/* $Id: layout.inc,v 1.231 2006/02/28 12:15:47 nlopess Exp $ */
+/* $Id: layout.inc,v 1.232 2006/02/28 16:49:54 rasmus Exp $ */
// Set the static content root differently on php.net
$_SERVER['STATIC_ROOT'] = ($MYSITE == 'http://www.php.net/') ?
@@ -75,7 +75,7 @@
// Print out lang and charset headers
if (!isset($config["lang"])) { $config["lang"] = "en"; }
- if (!isset($config["charset"])) { $config["charset"] =
"ISO-8859-1"; }
+ if (!isset($config["charset"])) { $config["charset"] = "utf-8"; }
header("Content-type: text/html;charset={$config['charset']}");
header("Content-language: {$config['lang']}");
http://cvs.php.net/viewcvs.cgi/phpweb/include/prepend.inc?r1=1.35&r2=1.36&diff_format=u
Index: phpweb/include/prepend.inc
diff -u phpweb/include/prepend.inc:1.35 phpweb/include/prepend.inc:1.36
--- phpweb/include/prepend.inc:1.35 Tue Feb 28 08:23:28 2006
+++ phpweb/include/prepend.inc Tue Feb 28 16:49:54 2006
@@ -1,6 +1,6 @@
<?php // -*- C++ -*-
-// $Id: prepend.inc,v 1.35 2006/02/28 08:23:28 rasmus Exp $
+// $Id: prepend.inc,v 1.36 2006/02/28 16:49:54 rasmus Exp $
// See http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9
// for cache control header descriptions (used in many places on the site).
@@ -8,7 +8,7 @@
// Provide default content-type, charset and language information
// Manual pages will override this, and maybe others too
header("Content-language: en");
-header("Content-type: text/html;charset=ISO-8859-1");
+header("Content-type: text/html; charset=utf-8");
// Prevent cross site scripting problems
unset($RSIDEBAR_DATA);