Add require_once for sites.php

In the new setup, we don't use config.php, which means jquery_default_site_options() is not defined unless this file is ensured first.
jquery · Sep 1, 2023 · bdbbe82 · bdbbe82
1 parent 821b0f2
commit bdbbe82
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/config.php b/config.php
@@ -1,6 +1,6 @@
 <?php
 
-require dirname( __FILE__ ) . '/sites.php';
+require_once dirname( __FILE__ ) . '/sites.php';
 
 if ( ! defined( 'WP_CONTENT_DIR' ) )
 	define( 'WP_CONTENT_DIR', ABSPATH . 'jquery-wp-content' );

diff --git a/install.php b/install.php
@@ -7,8 +7,11 @@
 	exit;
 }
 
-if ( ! isset( $_POST['weblog_title'] ) )
+if ( ! isset( $_POST['weblog_title'] ) ) {
 	$_POST['weblog_title'] = 'jQuery';
+}
+
+require_once dirname( __FILE__ ) . '/sites.php';
 
 function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated = '', $user_password = '' ) {
 	global $wpdb;

diff --git a/mu-plugins/jquery-filters.php b/mu-plugins/jquery-filters.php
@@ -4,8 +4,11 @@
  * Description: Default filters for all jQuery sites.
  */
 
-if ( defined( 'WP_INSTALLING' ) )
+if ( defined( 'WP_INSTALLING' ) ) {
 	return;
+}
+
+require_once dirname( __FILE__ ) . '/../sites.php';
 
 $options = jquery_default_site_options();
 $sites = jquery_sites();

diff --git a/sunrise.php b/sunrise.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname( __FILE__ ) . '/sites.php';
+
 // This is a single network configuration and the network is defined in config.php
 if ( defined( 'DOMAIN_CURRENT_SITE' ) && defined( 'PATH_CURRENT_SITE' ) ) {
 	$current_site = new stdClass;