Changeset 43364 for branches/4.9/src/wp-admin/includes/misc.php

Timestamp:

06/16/2018 01:11:57 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Privacy: Make sure wp_add_privacy_policy_content() does not cause a fatal error by unintentionally flushing rewrite rules outside of the admin context.

Add a _doing_it_wrong() message describing the correct usage of the function.

Props kraftbj, azaozz, SergeyBiryukov, YuriV.
Merges [43361], [43362], [43363] to the 4.9 branch.
Fixes #44142.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/misc.php (modified) (4 diffs)

branches/4.9/src/wp-admin/includes/misc.php

@@ -195 +195 @@
  *
  * @global WP_Rewrite $wp_rewrite
+ *
+ * @return bool|null True on write success, false on failure. Null in multisite.
  */
 function save_mod_rewrite_rules() {
@@ -202 +204 @@
     global $wp_rewrite;
 
-    $home_path = get_home_path();
-    $htaccess_file = $home_path.'.htaccess';
+    // Ensure get_home_path() is declared.
+    require_once( ABSPATH . 'wp-admin/includes/file.php' );
+
+    $home_path     = get_home_path();
+    $htaccess_file = $home_path . '.htaccess';
 
     /*
@@ -227 +232 @@
  * @global WP_Rewrite $wp_rewrite
  *
- * @return bool True if web.config was updated successfully
+ * @return bool|null True on write success, false on failure. Null in multisite.
  */
 function iis7_save_url_rewrite_rules(){
@@ -235 +240 @@
     global $wp_rewrite;
 
-    $home_path = get_home_path();
+    // Ensure get_home_path() is declared.
+    require_once( ABSPATH . 'wp-admin/includes/file.php' );
+
+    $home_path       = get_home_path();
     $web_config_file = $home_path . 'web.config';