Changeset 3373

Timestamp:

12/28/2005 07:05:05 AM (19 years ago)

Author:

ryan

Message:

Cache rewrite rules. Add WP_Rewrite::flush_rules(). fixes #2155

Location:

trunk

Files:

• wp-admin/install.php (modified) (1 diff)
• wp-admin/options-permalink.php (modified) (2 diffs)
• wp-admin/options.php (modified) (1 diff)
• wp-admin/upgrade-functions.php (modified) (2 diffs)
• wp-includes/classes.php (modified) (2 diffs)
• wp-includes/functions-post.php (modified) (5 diffs)

trunk/wp-admin/install.php

@@ -172 +172 @@
 
 $wpdb->query("INSERT INTO $wpdb->posts (post_author, post_date, post_date_gmt, post_content, post_excerpt, post_title, post_category, post_name, post_modified, post_modified_gmt, post_status, to_ping, pinged, post_content_filtered) VALUES ('1', '$now', '$now_gmt', '".$wpdb->escape(__('This is an example of a WordPress page, you could edit this to put information about yourself or your site so readers know where you are coming from. You can create as many pages like this one or sub-pages as you like and manage all of your content inside of WordPress.'))."', '', '".$wpdb->escape(__('About'))."', '0', '".$wpdb->escape(__('about'))."', '$now', '$now_gmt', 'static', '', '', '')");
-generate_page_rewrite_rules();
+$wp_rewrite->flush_rules();
 
 // Set up admin user

trunk/wp-admin/options-permalink.php

@@ -77 +77 @@
 $category_base = get_settings('category_base');
 
-generate_page_rewrite_rules();
-
 if ( (!file_exists($home_path.'.htaccess') && is_writable($home_path)) || is_writable($home_path.'.htaccess') )
     $writable = true;
@@ -89 +87 @@
     $usingpi = false;
 
-save_mod_rewrite_rules();
+$wp_rewrite->flush_rules();
 ?>
 

trunk/wp-admin/options.php

@@ -67 +67 @@
             if ( get_settings('siteurl') != $old_siteurl || get_settings('home') != $old_home ) {
                 // If home changed, write rewrite rules to new location.
-                save_mod_rewrite_rules();
+                $wp_rewrite->flush_rules();
                 // Get currently logged in user and password.
                 get_currentuserinfo();

trunk/wp-admin/upgrade-functions.php

@@ -5 +5 @@
 // Functions to be called in install and upgrade scripts
 function upgrade_all() {
-    global $wp_current_db_version, $wp_db_version;
+    global $wp_current_db_version, $wp_db_version, $wp_rewrite;
     $wp_current_db_version = __get_option('db_version');
 
@@ -34 +34 @@
         upgrade_160();
 
-    generate_page_rewrite_rules();
-    save_mod_rewrite_rules();
+    $wp_rewrite->flush_rules();
     
     update_option('db_version', $wp_db_version);

trunk/wp-includes/classes.php

@@ -1340 +1340 @@
 
     function wp_rewrite_rules() {
-        $this->matches = 'matches';
-        return $this->rewrite_rules();
+        $this->rules = get_option('rewrite_rules');
+        if ( empty($this->rules) ) {
+            $this->matches = 'matches';
+            $this->rewrite_rules();
+            update_option('rewrite_rules', $this->rules);
+        }
+
+        return $this->rules;
     }
 
@@ -1395 +1401 @@
 
         return $rules;
+    }
+
+    function flush_rules() {
+        generate_page_rewrite_rules();
+        delete_option('rewrite_rules');
+        $this->wp_rewrite_rules();
+        if ( function_exists('save_mod_rewrite_rules') )
+            save_mod_rewrite_rules();
     }
 

trunk/wp-includes/functions-post.php

@@ -7 +7 @@
  */
 function wp_insert_post($postarr = array()) {
-    global $wpdb, $allowedtags, $user_ID;
+    global $wpdb, $wp_rewrite, $allowedtags, $user_ID;
 
     if ( is_object($postarr) )
@@ -197 +197 @@
         }
     } else if ($post_status == 'static') {
-        generate_page_rewrite_rules();
+        $wp_rewrite->flush_rules();
 
         if ( !empty($page_template) )
@@ -527 +527 @@
 
 function wp_delete_post($postid = 0) {
-    global $wpdb;
+    global $wpdb, $wp_rewrite;
     $postid = (int) $postid;
 
@@ -560 +560 @@
 
     if ( 'static' == $post->post_status )
-        generate_page_rewrite_rules();
-    
+        $wp_rewrite->flush_rules();
+
     return $post;
 }
@@ -819 +819 @@
         if ( $page_attachment_rewrite_rules )
             update_option('page_attachment_uris', $page_attachment_rewrite_rules);
-
-        save_mod_rewrite_rules();
     }
 }