← All changes | src/component/class-mask-login.php +6 -6 5.7.2 → 6.3.0 View file →

		@@ -83,11 +83,10 @@
83	83
84	84	$request_uri = Request::get_request_uri();
85	85
86	86	// If parsed URL is null. PHP v8.1 displays it as deprecated.
87		- $path = empty( wp_parse_url( $site_url, PHP_URL_PATH ) )
88		- ? ''
89		- : wp_parse_url( $site_url, PHP_URL_PATH );
	87	+ $parsed_url = wp_parse_url( $site_url, PHP_URL_PATH );
	88	+ $path = false === $parsed_url || null === $parsed_url ? '' : $parsed_url;
90	89
91	90	if ( strlen( $path ) && 0 === strpos( $request_uri, $path ) ) {
92	91	$request_uri = substr( $request_uri, strlen( $path ) );
93	92	}
		@@ -105,9 +104,9 @@
105	104	*
106	105	* @return string The unfiltered site URL.
107	106	*/
108	107	private function get_site_url( $blog_id = null, $path = '', $scheme = null ) {
109		- if ( empty( $blog_id ) || ! is_multisite() ) {
	108	+ if ( is_null( $blog_id ) || ! is_multisite() ) {
110	109	$url = get_option( 'siteurl' );
111	110	} else {
112	111	switch_to_blog( $blog_id );
113	112	$url = get_option( 'siteurl' );
		@@ -160,9 +159,10 @@
160	159	* @return bool
161	160	* @since 3.12.0
162	161	*/
163	162	public function is_set_locale( string $mask_url ): bool {
164		- return $this->is_land_on_masked_url( $mask_url ) && ! empty( defender_get_data_from_request( 'wp_lang', 'g' ) );
	163	+ $lang = defender_get_data_from_request( 'wp_lang', 'g' );
	164	+ return $this->is_land_on_masked_url( $mask_url ) && ! is_null( $lang ) && '' !== $lang;
165	165	}
166	166
167	167	/**
168	168	* Set locale on Mask Login page.
		@@ -172,9 +172,9 @@
172	172	*/
173	173	public function set_locale(): void {
174	174	$wp_lang = defender_get_data_from_request( 'wp_lang', 'g' );
175	175
176		- if ( ! empty( $wp_lang ) ) {
	176	+ if ( ! is_null( $wp_lang ) && '' !== $wp_lang ) {
177	177	switch_to_locale( $wp_lang );
178	178	}
179	179	}
180	180