[geeklog-cvs] geeklog: Merging with Tom's meta tags change

[geeklog-cvs at lists.geeklog.net]

changeset 7686:9131a6c0e831
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/9131a6c0e831
user: Dirk Haun <dirk at haun-online.de>
date: Sat Jan 30 19:46:58 2010 +0100
description:
Merging with Tom's meta tags change

diffstat:

 public_html/lib-common.php |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (21 lines):

diff -r e1709d9d0bfd -r 9131a6c0e831 public_html/lib-common.php
--- a/public_html/lib-common.php	Sat Jan 30 18:48:58 2010 +0100
+++ b/public_html/lib-common.php	Sat Jan 30 19:46:58 2010 +0100
@@ -6861,13 +6861,13 @@
     global $_CONF;
 
     $headercode ='';
-    
-    If ($_CONF['meta_tags'] > 0) {
+
+    if ($_CONF['meta_tags'] > 0) {
         if ($meta_description != '') {
-            $headercode .= LB . '<meta name="description" content="' . $meta_description . '"' . XHTML . '>';
+            $headercode .= LB . '<meta name="description" content="' . ereg_replace("\n|\r|\r\n|\n\r", "", strip_tags($meta_description)) . '"' . XHTML . '>';
         }
         if ($meta_keywords != '') {
-            $headercode .= LB . '<meta name="keywords" content="' . $meta_keywords . '"' . XHTML . '>';
+            $headercode .= LB . '<meta name="keywords" content="' . ereg_replace("\n|\r|\r\n|\n\r", "", strip_tags($meta_keywords)) . '"' . XHTML . '>';
         }
     }