Merge pull request #5627 from Automattic/staging

Production release v20240604.0

.github/actions/prepare-source/action.yml

@@ -4,7 +4,7 @@ runs:
   using: composite
   steps:
     - name: Check out mu-plugins-ext
-      uses: actions/[email protected].5
+      uses: actions/[email protected].6
       with:
         repository: 'Automattic/vip-go-mu-plugins-ext'
         path: 'vip-go-mu-plugins-ext'

.github/workflows/changelog-summary-prod.yml

@@ -25,7 +25,7 @@ jobs:
           egress-policy: audit
 
       - name: Check out source code
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
 
       - name: Retrieve tags
         run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
@@ -61,7 +61,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
 
       - name: Setup PHP
         uses: shivammathur/[email protected]

.github/workflows/changelog-summary-staging.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
 
       - name: Setup PHP
         uses: shivammathur/[email protected]

.github/workflows/ci.yml

@@ -62,7 +62,7 @@ jobs:
           MYSQL_DATABASE: wordpress_test
     steps:
       - name: Check out source code
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
         with:
           submodules: recursive
 

.github/workflows/codeql-analysis.yml

@@ -29,13 +29,13 @@ jobs:
           - javascript
     steps:
       - name: Checkout repository
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/[email protected].5
+        uses: github/codeql-action/[email protected].6
         with:
           languages: ${{ matrix.language }}
           config-file: ./.github/codeql-config.yml
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/[email protected].5
+        uses: github/codeql-action/[email protected].6

.github/workflows/core-tests.yml

@@ -42,14 +42,14 @@ jobs:
           echo "PHP_FPM_GID=$(id -g)" >> "${GITHUB_ENV}"
 
       - name: Checkout WordPress
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
         with:
           repository: wordpress/wordpress-develop
           path: wordpress
           ref: ${{ steps.version.outputs.latest }}
 
       - name: Check out source code
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
         with:
           submodules: recursive
           path: wordpress/src/wp-content/mu-plugins

.github/workflows/coverage-develop.yml

@@ -36,7 +36,7 @@ jobs:
           MYSQL_DATABASE: wordpress_test
     steps:
       - name: Check out source code
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
         with:
           submodules: recursive
 

.github/workflows/dependency-review.yml

@@ -22,7 +22,7 @@ jobs:
             github.com:443
 
       - name: Check out the source code
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
 
       - name: Review dependencies
         uses: actions/[email protected]

.github/workflows/deploy.yml

@@ -22,19 +22,19 @@ jobs:
       contents: write
     steps:
       - name: Check out the source code
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
         with:
           submodules: recursive
           path: ${{ env.SOURCE_REPO_PATH }}
 
       - name: Check out Automattic/vip-go-mu-plugins-ext
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
         with:
           repository: Automattic/vip-go-mu-plugins-ext
           path: ${{ env.EXT_REPO_PATH }}
 
       - name: Check out Automattic/vip-go-mu-plugins-built
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
         with:
           repository: Automattic/vip-go-mu-plugins-built
           path: ${{ env.TARGET_REPO_PATH }}

.github/workflows/e2e.yml

@@ -68,7 +68,7 @@ jobs:
             wordpress.org:443
 
       - name: Check out repository code
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
         with:
           submodules: true
 
@@ -131,7 +131,7 @@ jobs:
           egress-policy: audit
 
       - name: Check out repository code
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
 
       - name: Setup Node
         uses: actions/[email protected]

.github/workflows/lint.yml

@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out source code
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
 
       - name: Set up PHP
         uses: shivammathur/[email protected]
@@ -51,7 +51,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out source code
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
 
       - name: Setup Node
         uses: actions/[email protected]

.github/workflows/parsely.yml

@@ -50,7 +50,7 @@ jobs:
           MYSQL_DATABASE: wordpress_test
     steps:
       - name: Check out source code
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
         with:
           submodules: recursive
 

.github/workflows/search-dev-tools.yml

@@ -22,7 +22,7 @@ jobs:
       contents: write
     steps:
       - name: Check out source code
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
         with:
           token: ${{ secrets.WPCOM_VIP_BOT_TOKEN }}
 

.github/workflows/search-e2e.yml

@@ -30,7 +30,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/[email protected].5
+      uses: actions/[email protected].6
       with:
         submodules: recursive
 

000-vip-init.php

@@ -250,7 +250,7 @@
 // Warning: Site Details depends on the existence of class Search.
 // If this changes in the future, please ensure that details for search are correctly extracted
 if ( ( defined( 'USE_VIP_ELASTICSEARCH' ) && USE_VIP_ELASTICSEARCH ) || // legacy constant name
-	defined( 'VIP_ENABLE_VIP_SEARCH' ) && true === VIP_ENABLE_VIP_SEARCH ) {
+	( defined( 'VIP_ENABLE_VIP_SEARCH' ) && true === VIP_ENABLE_VIP_SEARCH ) ) {
 	require_once __DIR__ . '/search/search.php';
 }