Changeset 53915

Timestamp:

08/20/2022 12:30:54 AM (2 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Simplify the logic in wp_not_installed().

The function to check whether WordPress is not installed has evolved over time, ending up with duplicate conditionals.

This commit combines two conditionals into a single one and includes an early return.

Follow-up to [672], [676], [725], [1184], [1401], [1980], [2171], [2467], [2468], [2486], [2703], [3011], [3670], [12688], [12732], [12762], [13253], [29599], [30581], [34828].

See #55647.

File:

• trunk/src/wp-includes/load.php (modified) (1 diff)

trunk/src/wp-includes/load.php

@@ -769 +769 @@
  */
 function wp_not_installed() {
+    if ( is_blog_installed() || wp_installing() ) {
+        return;
+    }
+
+    nocache_headers();
+
     if ( is_multisite() ) {
-        if ( ! is_blog_installed() && ! wp_installing() ) {
-            nocache_headers();
-
-            wp_die( __( 'The site you have requested is not installed properly. Please contact the system administrator.' ) );
-        }
-    } elseif ( ! is_blog_installed() && ! wp_installing() ) {
-        nocache_headers();
-
-        require ABSPATH . WPINC . '/kses.php';
-        require ABSPATH . WPINC . '/pluggable.php';
-
-        $link = wp_guess_url() . '/wp-admin/install.php';
-
-        wp_redirect( $link );
-        die();
-    }
+        wp_die( __( 'The site you have requested is not installed properly. Please contact the system administrator.' ) );
+    }
+
+    require ABSPATH . WPINC . '/kses.php';
+    require ABSPATH . WPINC . '/pluggable.php';
+
+    $link = wp_guess_url() . '/wp-admin/install.php';
+
+    wp_redirect( $link );
+    die();
 }