Changeset 6039

Timestamp:

09/05/2007 07:20:53 PM (19 years ago)

Author:

markjaquith

Message:

Deprecate option_can_override, option_type, option_width, option_height, option_description, option_admin_level from options table. Props Nazgul. fixes #4390

Location:

trunk

Files:

• wp-admin/includes/schema.php (modified) (3 diffs)
• wp-admin/includes/upgrade.php (modified) (2 diffs)
• wp-admin/options.php (modified) (1 diff)
• wp-includes/functions.php (modified) (2 diffs)
• wp-includes/version.php (modified) (1 diff)

trunk/wp-admin/includes/schema.php

@@ -78 +78 @@
   blog_id int(11) NOT NULL default '0',
   option_name varchar(64) NOT NULL default '',
-  option_can_override enum('Y','N') NOT NULL default 'Y',
-  option_type int(11) NOT NULL default '1',
   option_value longtext NOT NULL,
-  option_width int(11) NOT NULL default '20',
-  option_height int(11) NOT NULL default '8',
-  option_description tinytext NOT NULL,
-  option_admin_level int(11) NOT NULL default '1',
   autoload enum('yes','no') NOT NULL default 'yes',
   PRIMARY KEY  (option_id,blog_id,option_name),
@@ -156 +150 @@
         $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
         $guessurl = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
-        add_option('siteurl', $guessurl, __('WordPress web address'));
-        add_option('blogname', __('My Blog'), __('Blog title'));
-        add_option('blogdescription', __('Just another WordPress weblog'), __('Short tagline'));
+        add_option('siteurl', $guessurl);
+        add_option('blogname', __('My Blog'));
+        add_option('blogdescription', __('Just another WordPress weblog'));
         add_option('new_users_can_blog', 0);
         add_option('users_can_register', 0);
@@ -204 +198 @@
         add_option('gmt_offset', date('Z') / 3600);
         // 1.5
-        add_option('default_email_category', 1, __('Posts by email go to this category'));
+        add_option('default_email_category', 1);
         add_option('recently_edited');
         add_option('use_linksupdate', 0);

trunk/wp-admin/includes/upgrade.php

@@ -192 +192 @@
                 upgrade_230();
 
+        if ( $wp_current_db_version < 6039 )
+                upgrade_230_options_table();
 
         maybe_disable_automattic_widgets();
@@ -677 +679 @@
                 $wpdb->query("UPDATE $wpdb->term_taxonomy SET count = '$count' WHERE term_taxonomy_id = '$term'");
         }
+}
+
+function upgrade_230_options_table() {
+        global $wpdb;
+        $old_options_fields = array( 'option_can_override', 'option_type', 'option_width', 'option_height', 'option_description', 'option_admin_level' );
+        $wpdb->hide_errors();
+        foreach ( $old_options_fields as $old )
+                $wpdb->query("ALTER TABLE $wpdb->options DROP $old");
+        $wpdb->show_errors();
 }
 

trunk/wp-admin/options.php

@@ -83 +83 @@
 
         echo "</td>
-        <td>$option->option_description</td>
 </tr>";
 endforeach;

trunk/wp-includes/functions.php

@@ -330 +330 @@
 // thx Alex Stapleton, http://alex.vort-x.net/blog/
 // expects $name to NOT be SQL-escaped
-function add_option($name, $value = '', $description = '', $autoload = 'yes') {
+function add_option($name, $value = '', $deprecated = '', $autoload = 'yes') {
         global $wpdb;
 
@@ -362 +362 @@
         $name = $wpdb->escape($name);
         $value = $wpdb->escape($value);
-        $description = $wpdb->escape($description);
-        $wpdb->query("INSERT INTO $wpdb->options (option_name, option_value, option_description, autoload) VALUES ('$name', '$value', '$description', '$autoload')");
+        $wpdb->query("INSERT INTO $wpdb->options (option_name, option_value, autoload) VALUES ('$name', '$value', '$autoload')");
 
         return;

trunk/wp-includes/version.php

@@ -4 +4 @@
 
 $wp_version = '2.3-beta2';
-$wp_db_version = 5540;
+$wp_db_version = 6039;
 
 ?>