From 1ad7523202395d90116494ee53a3262e2371a3bd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sat, 28 Mar 2009 01:12:17 +0000
Subject: [PATCH] Some HTML issues fixed
---
inc/functions.php | 4 ++--
templates/de/html/metadata.tpl | 4 ----
templates/de/html/page_body.tpl | 1 +
templates/de/html/page_header.tpl | 4 ++++
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/inc/functions.php b/inc/functions.php
index 0b6877db34..66da69fa61 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2976,8 +2976,8 @@ function smartAddSlashes ($unquoted) {
// Decode entities in a nicer way
function decodeEntities ($str) {
- // @TODO We may want to switch over to UTF-8 here!
- $decodedString = html_entity_decode($str, ENT_NOQUOTES, "ISO-8859-15");
+ // Decode the entities to UTF-8 now
+ $decodedString = html_entity_decode($str, ENT_NOQUOTES, "UTF-8");
// Return decoded string
return $decodedString;
diff --git a/templates/de/html/metadata.tpl b/templates/de/html/metadata.tpl
index cab9eb6572..1de82b5a3c 100644
--- a/templates/de/html/metadata.tpl
+++ b/templates/de/html/metadata.tpl
@@ -2,7 +2,3 @@
<meta name="publisher" content="Ihr Name nochmal" />
<meta name="keywords" content="{!POINTS!}, mailtausch, mailversand, kostenlos, kostenloser, mailexchange, werbemail, werbemailversand, exchange, werbepunkte, punkte, auktion, auktionen, umsonst, sms kostenlos, produkte, produktproben, gewinn, gewinnspiel, gratis sms, promotion, besucher, werbung, linkliste, geldverdienen, verdienen, traffic, hits" />
<meta name="robots" content="index,follow" />
-<meta http-equiv="content-type" content="text/html; charset=UTF8" />
-<meta http-equiv="content-style-type" content="text/css" />
-<meta http-equiv="content-script-type" content="text/javascript" />
-<meta http-equiv="language" content="de" />
diff --git a/templates/de/html/page_body.tpl b/templates/de/html/page_body.tpl
index cdf59ecad1..4803bf36cc 100644
--- a/templates/de/html/page_body.tpl
+++ b/templates/de/html/page_body.tpl
@@ -1 +1,2 @@
+<body>
<div class="masterbox" id="master">
diff --git a/templates/de/html/page_header.tpl b/templates/de/html/page_header.tpl
index 0aa8bb4b33..01fc06f87b 100644
--- a/templates/de/html/page_header.tpl
+++ b/templates/de/html/page_header.tpl
@@ -2,3 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de" lang="de">
<head>
<title>{!__PAGE_TITLE!}</title>
+<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
+<meta http-equiv="content-style-type" content="text/css" />
+<meta http-equiv="content-script-type" content="text/javascript" />
+<meta http-equiv="language" content="de" />
--
2.39.5