Changeset 11579

Timestamp:

06/16/2009 02:50:55 AM (15 years ago)

Author:

ryan

Message:

Don't write to htaccess every time page is saved. Add hard/soft flush flag to flush_rules(). Make sure fopen is successful and silence errors. Props Viper007Bond. fixes #10181 for 2.8.1

Location:

branches/2.8

Files:

• wp-admin/admin.php (modified) (1 diff)
• wp-admin/includes/misc.php (modified) (1 diff)
• wp-includes/post.php (modified) (2 diffs)
• wp-includes/rewrite.php (modified) (1 diff)

branches/2.8/wp-admin/admin.php

@@ -147 +147 @@
     // Make sure rules are flushed
     global $wp_rewrite;
-    $wp_rewrite->flush_rules();
+    $wp_rewrite->flush_rules(false);
 
     exit();

branches/2.8/wp-admin/includes/misc.php

@@ -73 +73 @@
         }
 
-        $f = fopen( $filename, 'w' );
+        if ( !$f = @fopen( $filename, 'w' ) )
+            return false;
+
         $foundit = false;
         if ( $markerdata ) {

branches/2.8/wp-includes/post.php

@@ -1193 +1193 @@
             clean_page_cache($child->ID);
 
-        $wp_rewrite->flush_rules();
+        $wp_rewrite->flush_rules(false);
     } else {
         clean_post_cache($postid);
@@ -3355 +3355 @@
         if ( !defined('WP_IMPORTING') ) {
             global $wp_rewrite;
-            $wp_rewrite->flush_rules();
+            $wp_rewrite->flush_rules(false);
         }
     } else {

branches/2.8/wp-includes/rewrite.php

@@ -1823 +1823 @@
      * @since 2.0.1
      * @access public
-     */
-    function flush_rules() {
+     * @param $hard bool Whether to update .htaccess (hard flush) or just update rewrite_rules transient (soft flush). Default is true (hard).
+     */
+    function flush_rules($hard = true) {
         delete_transient('rewrite_rules');
         $this->wp_rewrite_rules();
-        if ( function_exists('save_mod_rewrite_rules') )
+        if ( $hard && function_exists('save_mod_rewrite_rules') )
             save_mod_rewrite_rules();
-        if ( function_exists('iis7_save_url_rewrite_rules') )
+        if ( $hard && function_exists('iis7_save_url_rewrite_rules') )
             iis7_save_url_rewrite_rules();
     }