Changeset 4831

Timestamp:

01/30/2007 01:43:39 AM (17 years ago)

Author:

ryan

Message:

Remove notoptions caching. Multile rewrite_rules options were being created. See #3692 #2268

Location:

trunk

Files:

• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-admin/upgrade-schema.php (modified) (1 diff)
• wp-includes/functions.php (modified) (4 diffs)
• wp-includes/post.php (modified) (2 diffs)
• wp-includes/version.php (modified) (1 diff)
• wp-includes/wp-db.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)

trunk/wp-admin/edit-form-advanced.php

@@ -76 +76 @@
 </fieldset>
 
+<fieldset id="tagdiv" class="dbx-box">
+<h3 class="dbx-handle"><?php _e('Tags') ?></h3>
+<div class="dbx-content">
+<p id="jaxtag"></p>
+<ul id="tagchecklist"><?php dropdown_tags(); ?></ul></div>
+</fieldset>
+
 <fieldset id="commentstatusdiv" class="dbx-box">
 <h3 class="dbx-handle"><?php _e('Discussion') ?></h3>

trunk/wp-admin/upgrade-schema.php

@@ -120 +120 @@
   KEY post_name (post_name),
   KEY type_status_date (post_type,post_status,post_date,ID)
+);
+CREATE TABLE $wpdb->tags (
+  tag_id bigint(20) unsigned NOT NULL auto_increment,
+  tag varchar(30) NOT NULL default '',
+  raw_tag varchar(50) NOT NULL default '',
+  tag_count bigint(20) unsigned NOT NULL default '0',
+  PRIMARY KEY  (tag_id)
+);
+CREATE TABLE $wpdb->tagged (
+  tag_id bigint(20) unsigned NOT NULL default '0',
+  post_id bigint(20) unsigned NOT NULL default '0',
+  PRIMARY KEY  (tag_id,post_id),
+  KEY tag_id_index (tag_id),
+  KEY post_id_index (post_id)
 );
 CREATE TABLE $wpdb->users (

trunk/wp-includes/functions.php

@@ -204 +204 @@
     global $wpdb;
 
-    // prevent non-existent options from triggering multiple queries
-    if ( true === wp_cache_get($setting, 'notoptions') )
-        return false;
-
     $value = wp_cache_get($setting, 'options');
 
@@ -220 +216 @@
             $value = $row->option_value;
             wp_cache_set($setting, $value, 'options');
-        } else { // option does not exist, so we must cache its non-existence
-            wp_cache_set($setting, true, 'notoptions');
+        } else {
             return false;
         }
@@ -280 +275 @@
     }
 
-    if ( true === wp_cache_get($option_name, 'notoptions') )
-        wp_cache_delete($option_name, 'notoptions');
-
     $_newvalue = $newvalue;
     $newvalue = maybe_serialize($newvalue);
@@ -302 +294 @@
     global $wpdb;
 
-    // Make sure the option doesn't already exist we can check the cache before we ask for a db query
-    if ( true === wp_cache_get($name, 'notoptions') )
-        wp_cache_delete($name, 'notoptions');
-    else
-        if ( false !== get_option($name) )
-            return;
+    // Make sure the option doesn't already exist
+    if ( false !== get_option($name) )
+        return;
 
     $value = maybe_serialize($value);

trunk/wp-includes/post.php

@@ -522 +522 @@
     }
     $post_cat = $post_category[0];
+
+    if ( empty($post_tags) )
+        $post_tags = array();
 
     if ( empty($post_author) )
@@ -647 +650 @@
 
     wp_set_post_categories($post_ID, $post_category);
+    wp_set_post_tags($post_ID, $post_tags);
 
     if ( 'page' == $post_type ) {

trunk/wp-includes/version.php

@@ -4 +4 @@
 
 $wp_version = '2.2-bleeding';
-$wp_db_version = 4772;
+$wp_db_version = 4815;
 
 ?>

trunk/wp-includes/wp-db.php

@@ -35 +35 @@
     var $optiongroup_options;
     var $postmeta;
+    var $tags;
+    var $tagged;
 
     /**

trunk/wp-settings.php

@@ -117 +117 @@
 $wpdb->postmeta       = $wpdb->prefix . 'postmeta';
 $wpdb->usermeta       = $wpdb->prefix . 'usermeta';
+$wpdb->tags           = $wpdb->prefix . 'tags';
+$wpdb->tagged         = $wpdb->prefix . 'tagged';
 
 if ( defined('CUSTOM_USER_TABLE') )