From 4e12355549049560b5033150323238d0d4643cb9 Mon Sep 17 00:00:00 2001
From: michelvaldrighi <michelvaldrighi@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Tue, 17 Feb 2004 02:11:16 +0000
Subject: [PATCH] adding blog_charset option

git-svn-id: http://svn.automattic.com/wordpress/trunk@878 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/install.php           | 1 +
 wp-admin/options-general.php   | 8 +++++++-
 wp-admin/upgrade-functions.php | 4 ++++
 wp-settings.php                | 1 +
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/wp-admin/install.php b/wp-admin/install.php
index e18363563..60cb22d5c 100644
--- a/wp-admin/install.php
+++ b/wp-admin/install.php
@@ -378,6 +378,7 @@ $option_data = array(
 "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(7,'new_users_can_blog', 2, '0', 'whether you want new users to be able to post entries once they have registered', 8, 20)",
 "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(8,'users_can_register', 2, '1', 'whether you want to allow users to register on your blog', 8, 20)",
 "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(54,'admin_email', 3, 'you@example.com', 'Your email (obvious eh?)', 8, 20)",
+"INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES (93, 1, 'blog_charset', 'Y', 3, 'utf-8', 20, 8, 'your blog\'s charset (here\'s a <a href=\"http://developer.apple.com/documentation/macos8/TextIntlSvcs/TextEncodingConversionManager/TEC1.5/TEC.b0.html\">list of possible charsets</a>)', 8)",
 // general blog setup
 "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(9 ,'start_of_week', 5, '1', 'day at the start of the week', 8, 20)",
 //"INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(10,'use_preview', 2, '1', 'Do you want to use the \'preview\' function', 8, 20)",
diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index 3a3eebe7e..a397b0adc 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -85,7 +85,13 @@ In a few words, explain what this weblog is about.</td>
         <td><input name="admin_email" type="text" id="admin_email" value="<?php echo get_settings('admin_email'); ?>" size="40" class="code" />
         <br />
 This address is used only for admin purposes. </td> 
-      </tr> 
+      </tr>
+      <tr valign="top">
+	<th scope="row">Charset</th>
+	<td><input name="blog_charset" type="text" id="blog_charset" value="<?php echo get_settings('blog_charset'); ?>" size="20" class="code" />
+	  <br />
+	  Your weblog's charset (here's a <a href="http://developer.apple.com/documentation/macos8/TextIntlSvcs/TextEncodingConversionManager/TEC1.5/TEC.b0.html">list of possible charsets</a>)</td>
+      </tr>
       <tr valign="top"> 
         <th scope="row">Membership:</th> 
         <td> <label for="users_can_register"> 
diff --git a/wp-admin/upgrade-functions.php b/wp-admin/upgrade-functions.php
index 217b2a112..f08d55c6c 100644
--- a/wp-admin/upgrade-functions.php
+++ b/wp-admin/upgrade-functions.php
@@ -706,6 +706,10 @@ function upgrade_110() {
 	}
 	
 	$wpdb->query("DELETE FROM $tableoptiongroups WHERE group_id = 6");
+
+	// Add blog_charset option
+	$wpdb->query("INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES (93, 1, 'blog_charset', 'Y', 3, 'utf-8', 20, 8, 'your blog\'s charset (here\'s a <a href=\"http://developer.apple.com/documentation/macos8/TextIntlSvcs/TextEncodingConversionManager/TEC1.5/TEC.b0.html\">list of possible charsets</a>)', 8)");
+
 }
 
 ?>
\ No newline at end of file
diff --git a/wp-settings.php b/wp-settings.php
index fdec65042..25f674045 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -59,6 +59,7 @@ if (!strstr($_SERVER['REQUEST_URI'], 'install.php') && !strstr($_SERVER['REQUEST
     $admin_email = get_settings('admin_email');
     $new_users_can_blog = get_settings('new_users_can_blog');
     $users_can_register = get_settings('users_can_register');
+    $blog_charset = get_settings('blog_charset');
     $start_of_week = get_settings('start_of_week');
     $use_bbcode = get_settings('use_bbcode');
     $use_gmcode = get_settings('use_gmcode');