Ticket #35066: 35066.2.diff

wp-includes/load.php

@@ -160 +160 @@
 /**
  * Die with a maintenance message when conditions are met.
  *
- * Checks for a file in the WordPress root directory named ".maintenance".
+ * Checks for a file in the WordPress root directory named "wordpress.maintenance"
+ * or '.maintenance' (deprecated).
+ *
  * This file will contain the variable $upgrading, set to the time the file
  * was created. If the file was created less than 10 minutes ago, WordPress
  * enters maintenance mode and displays a message.
@@ -174 +176 @@
  * @global int $upgrading the unix timestamp marking when upgrading WordPress began.
  */
 function wp_maintenance() {
-        if ( ! file_exists( ABSPATH . '.maintenance' ) || wp_installing() )
+        if ( ( ! file_exists( ABSPATH . 'wordpress.maintenance' ) && ! file_exists( ABSPATH . '.maintenance' ) ) || wp_installing() )
                 return;
 
         global $upgrading;
+        if ( file_exists( ABSPATH . 'wordpress.maintenance' ) ) {
+                include ( ABSPATH . 'wordpress.maintenance' );
+        } else {
+                include ( ABSPATH . '.maintenance' );
+        }
 
-        include( ABSPATH . '.maintenance' );
         // If the $upgrading timestamp is older than 10 minutes, don't die.
         if ( ( time() - $upgrading ) >= 600 )
                 return;