From 11aaf4e7685e11e38507b55cbd34e706f2208fc2 Mon Sep 17 00:00:00 2001 From: saxmatt Date: Fri, 20 Feb 2004 16:29:08 +0000 Subject: [PATCH] Installation and upgrade DB errors. git-svn-id: http://svn.automattic.com/wordpress/trunk@899 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/install.php | 2 +- wp-admin/upgrade-functions.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-admin/install.php b/wp-admin/install.php index 8843b06d0..fadd4b37d 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -378,7 +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 list of possible charsets)', 8)", +"INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level) VALUES (93, 'blog_charset', 3, 'utf-8', 'Your blog’s charset (here’s a list of possible charsets)', 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/upgrade-functions.php b/wp-admin/upgrade-functions.php index 6d13c8024..1142bee0a 100644 --- a/wp-admin/upgrade-functions.php +++ b/wp-admin/upgrade-functions.php @@ -708,8 +708,8 @@ function upgrade_110() { $wpdb->query("DELETE FROM $tableoptiongroups WHERE group_id = 6"); // Add blog_charset option - if(!$wpdb->get_var("SELECT * FROM $tableoptiongroup_options WHERE option_id = '93'")) { - $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 list of possible charsets)', 8)"); + if(!$wpdb->get_var("SELECT * FROM $tableoptions WHERE option_id = '93'")) { + $wpdb->query("INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level) VALUES (93, 'blog_charset', 3, 'utf-8', 'Your blog’s charset (here’s a list of possible charsets)', 8)"); } }