Merge pull request #5708 from Automattic/staging

Production release v20240709.0
Automattic · Jul 9, 2024 · d1c81e0 · d1c81e0
2 parents 0f9b1e5 + 4ee048b
commit d1c81e0
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 14 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -32,10 +32,10 @@ jobs:
         uses: actions/checkout@v4.1.7
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3.25.10
+        uses: github/codeql-action/init@v3.25.11
         with:
           languages: ${{ matrix.language }}
           config-file: ./.github/codeql-config.yml
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3.25.10
+        uses: github/codeql-action/analyze@v3.25.11
diff --git a/bin/test.sh b/bin/test.sh
@@ -115,7 +115,6 @@ docker run \
     ${interactive} \
     --rm \
     --network "${NETWORK_NAME}" \
-    --platform linux/x86_64 \
     -e WP_VERSION \
     -e WP_MULTISITE \
     -e PHP_VERSION \

diff --git a/search/search-dev-tools/build/bundle.js b/search/search-dev-tools/build/bundle.js
diff --git a/search/search-dev-tools/package-lock.json b/search/search-dev-tools/package-lock.json
diff --git a/search/search-dev-tools/package.json b/search/search-dev-tools/package.json
@@ -14,7 +14,7 @@
     "build/*"
   ],
   "devDependencies": {
-    "@automattic/eslint-plugin-wpvip": "^0.11.0",
+    "@automattic/eslint-plugin-wpvip": "^0.12.0",
     "@babel/core": "^7.23.2",
     "@babel/plugin-transform-class-properties": "^7.22.5",
     "@babel/plugin-transform-object-assign": "^7.22.5",

diff --git a/vip-helpers/vip-utils.php b/vip-helpers/vip-utils.php
@@ -1443,6 +1443,16 @@ function is_automattician( $user_id = false ) {
 	if ( $user_id ) {
 		$user = new WP_User( $user_id );
 	} else {
+		if ( ! function_exists( 'wp_get_current_user' ) ) {
+			_doing_it_wrong( __FUNCTION__, 'This function should not be called without $user_id before the `plugins_loaded` hook.', null );
+			return false;
+		}
+
+		if ( ! did_action( 'init' ) && ! has_filter( 'determine_current_user' ) ) {
+			_doing_it_wrong( __FUNCTION__, 'This function should not be called without $user_id before the `init` hook without a filter for the `determine_current_user` hook.', null );
+			return false;
+		}
+
 		$user = wp_get_current_user();
 	}