From 1464a3364fa3469dd37b6b0533c95f0673d39334 Mon Sep 17 00:00:00 2001
From: jverber <jverber@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sat, 19 Jun 2004 04:23:59 +0000
Subject: [PATCH] Fixes for bugs #0000088-90: fixed encoding of special chars.

git-svn-id: http://svn.automattic.com/wordpress/trunk@1438 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/options-general.php   | 4 ++--
 wp-admin/options-permalink.php | 2 +-
 wp-admin/options-reading.php   | 2 +-
 wp-includes/functions.php      | 4 ++--
 wp-includes/vars.php           | 2 ++
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index 0d4017cce8..44103c55a6 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -50,11 +50,11 @@ include('options-head.php');
     <table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
       <tr valign="top"> 
         <th width="33%" scope="row"><?php _e('Weblog title:') ?></th> 
-        <td><input name="blogname" type="text" id="blogname" value="<?php echo get_settings('blogname'); ?>" size="40" /></td> 
+        <td><input name="blogname" type="text" id="blogname" value="<?php echo htmlspecialchars(get_settings('blogname')); ?>" size="40" /></td> 
       </tr> 
       <tr valign="top"> 
         <th scope="row"><?php _e('Tagline:') ?></th> 
-        <td><input name="blogdescription" type="text" id="blogdescription" style="width: 95%" value="<?php echo get_settings('blogdescription'); ?>" size="45" />
+        <td><input name="blogdescription" type="text" id="blogdescription" style="width: 95%" value="<?php echo htmlspecialchars(get_settings('blogdescription')); ?>" size="45" />
         <br />
 <?php _e('In a few words, explain what this weblog is about.') ?></td> 
       </tr> 
diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index 0bfb9bc4ee..85a1fc4133 100644
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -137,7 +137,7 @@ echo apply_filters('rewrite_rules', $rules);
     </p>
     <?php printf(__('<p>If your <code>.htaccess</code> file is writable by WordPress, you can <a href="%s">edit it through your template interface</a>.</p>'), 'templates.php?file=.htaccess') ?>
 </form>
-</div> 
+ 
 <?php
 } else {
 ?>
diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index a785de9efc..2bf5f65603 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -74,7 +74,7 @@ include('options-head.php');
                 <th scope="row"><?php _e('For each article, show:') ?> </th>
 				<td><label>
 					<input name="rss_use_excerpt"  type="radio" value="0" <?php checked(0, get_settings('rss_use_excerpt')); ?>  />
-					<?php _e('full text') ?></label>					<br>
+					<?php _e('full text') ?></label>					<br />
 					<label>
 					<input name="rss_use_excerpt" type="radio" value="1" <?php checked(1, get_settings('rss_use_excerpt')); ?> />
 					<?php _e('summary') ?></label> </td>
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 9faeb7c52d..14201af249 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -816,7 +816,7 @@ function doGeoUrlHeader($post_list = '') {
         $title = $row->post_title;
         if(($lon != null) && ($lat != null) ) {
             echo "<meta name=\"ICBM\" content=\"".$lat.", ".$lon."\" />\n";
-            echo "<meta name=\"DC.title\" content=\"".convert_chars(strip_tags(get_bloginfo("name")))." - ".$title."\" />\n";
+            echo "<meta name=\"DC.title\" content=\"".convert_chars(strip_tags(htmlspecialchars(get_bloginfo("name"))))." - ".$title."\" />\n";
             echo "<meta name=\"geo.position\" content=\"".$lat.";".$lon."\" />\n";
             return;
         }
@@ -824,7 +824,7 @@ function doGeoUrlHeader($post_list = '') {
         if(get_settings('use_default_geourl')) {
             // send the default here 
             echo "<meta name='ICBM' content=\"". get_settings('default_geourl_lat') .", ". get_settings('default_geourl_lon') ."\" />\n";
-            echo "<meta name='DC.title' content=\"".convert_chars(strip_tags(get_bloginfo("name")))."\" />\n";
+            echo "<meta name='DC.title' content=\"".convert_chars(strip_tags(htmlspecialchars(get_bloginfo("name"))))."\" />\n";
             echo "<meta name='geo.position' content=\"". get_settings('default_geourl_lat') .";". get_settings('default_geourl_lon') ."\" />\n";
         }
     }
diff --git a/wp-includes/vars.php b/wp-includes/vars.php
index e75fff2718..c8f085b813 100644
--- a/wp-includes/vars.php
+++ b/wp-includes/vars.php
@@ -176,6 +176,8 @@ foreach($wpsmiliestrans as $smiley => $img) {
 define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_settings('home') . '/' ) );
 
 // Some default filters
+add_filter('rewrite_rules','htmlspecialchars');
+add_filter('bloginfo','htmlspecialchars');
 add_filter('category_description', 'wptexturize');
 add_filter('list_cats', 'wptexturize');
 add_filter('comment_author', 'wptexturize');