← All changes | includes/user.php +6 -10 4.3.0-beta2 → 3.32.0-dev3 View file →

		@@ -126,12 +126,8 @@
126	126	if ( intval( get_option( 'page_for_posts' ) ) === $post->ID ) {
127	127	return false;
128	128	}
129	129
130		- if ( function_exists( 'wc_get_page_id' ) && intval( wc_get_page_id( 'shop' ) ) === $post->ID ) {
131		- return false;
132		- }
133		-
134	130	return true;
135	131	}
136	132
137	133	/**
		@@ -366,20 +362,20 @@
366	362	return $user_introduction_meta;
367	363	}
368	364
369	365	/**
370		- * Get a user option with a fallback value.
	366	+ * Get a user option with default value as fallback.
371	367	*
372		- * @param string $option Option key.
373		- * @param int $user_id User ID.
374		- * @param mixed $fallback Default fallback value.
	368	+ * @param string $option - Option key.
	369	+ * @param int $user_id - User ID.
	370	+ * @param mixed $default - Default fallback value.
375	371	*
376	372	* @return mixed
377	373	*/
378		- public static function get_user_option_with_default( $option, $user_id, $fallback ) {
	374	+ public static function get_user_option_with_default( $option, $user_id, $default ) {
379	375	$value = get_user_option( $option, $user_id );
380	376
381		- return ( false === $value ) ? $fallback : $value;
	377	+ return ( false === $value ) ? $default : $value;
382	378	}
383	379
384	380	/**
385	381	* Get dismissed editor notices.