cvs: smarty /docs/chm common.php /docs/pt_BR make_chm_index.html
"Nuno Lopes" <[email protected]>
| Newsgroups | gmane.comp.php.cvs.smarty |
|---|---|
| Message-ID | <cvsnlopess1108335006@cvsserver> |
nlopess Sun Feb 13 17:50:06 2005 EDT
Modified files:
/smarty/docs/chm common.php
/smarty/docs/pt_BR make_chm_index.html
Log:
fix charset detection in CHM
http://cvs.php.net/diff.php/smarty/docs/chm/common.php?r1=1.1&r2=1.2&ty=u
Index: smarty/docs/chm/common.php
diff -u smarty/docs/chm/common.php:1.1 smarty/docs/chm/common.php:1.2
--- smarty/docs/chm/common.php:1.1 Thu Feb 10 08:27:26 2005
+++ smarty/docs/chm/common.php Sun Feb 13 17:50:05 2005
@@ -61,7 +61,7 @@
// Returns the name of character set in the given document
function detectDocumentCharset($doc)
{
- if (preg_match("/<META\\s+HTTP-EQUIV=\"CONTENT-TYPE\"\\s+CONTENT=\"TEXT\\/HTML;\\s+CHARSET=([\\w\\d-]*)\"\\s*>/iU", $doc, $reg)) {
+ if (preg_match('/<META[^>]+CHARSET=["\'\s]?([\w\d-]+)["\'\s]?\s*>/iS', $doc, $reg)) {
return $reg[1];
}
return false;
http://cvs.php.net/diff.php/smarty/docs/pt_BR/make_chm_index.html?r1=1.1&r2=1.2&ty=u
Index: smarty/docs/pt_BR/make_chm_index.html
diff -u smarty/docs/pt_BR/make_chm_index.html:1.1 smarty/docs/pt_BR/make_chm_index.html:1.2
--- smarty/docs/pt_BR/make_chm_index.html:1.1 Thu Feb 10 14:27:13 2005
+++ smarty/docs/pt_BR/make_chm_index.html Sun Feb 13 17:50:06 2005
@@ -1,6 +1,6 @@
<HTML>
<!-- EN-Revision: 1.1 Maintainer: nlopess Status: ready -->
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
<HEAD>
<TITLE>Manual do Smarty</TITLE>
<META NAME="HTTP_EQUIV" CONTENT="text/html; charset=ISO-8859-1">
@@ -10,7 +10,7 @@
<TABLE BORDER="0" WIDTH="100%" HEIGHT="100%" CELLSPACING="0" CELLPADDING="0">
<TR><TD COLSPAN="3"><DIV CLASS="NAVHEADER"><TABLE BGCOLOR="#CCCCFF" BORDER="0"
CELLPADDING="0" CELLSPACING="0" WIDTH="100%"><TR><TD><TABLE WIDTH="100%" BORDER="0"
-CELLPADDING="3" CELLSPACING="0"><TR><TH COLSPAN="3">Smarty Manual</TH></TR><TR><TD
+CELLPADDING="3" CELLSPACING="0"><TR><TH COLSPAN="3">Manual do Smarty</TH></TR><TR><TD
COLSPAN="3" ALIGN="center"> </TD></TR></TABLE></TD></TR><TR BGCOLOR="#333366">
<TD><IMG SRC="spacer.gif" BORDER="0" WIDTH="1" HEIGHT="1"><BR></TD></TR></TABLE></DIV></TD></TR>
<TR><TD><IMG SRC="spacer.gif" WIDTH="10" HEIGHT="1"></TD><TD HEIGHT="100%" VALIGN="MIDDLE" WIDTH="100%"><BR>
--
Smarty CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php