Uploads: Remove an unnecessary static var from wp_is_mobile() to allow its direct and indirect use within unit tests. The static `$is_m

obile` var was only used to avoid a handful of calls to `strpos()`, which are exceptionally fast and result in no measurable increase in
processing time on each call to `wp_is_mobile()`.

See #35976, #20014

Built from https://develop.svn.wordpress.org/trunk@36813


git-svn-id: http://core.svn.wordpress.org/trunk@36780 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2016-03-03 03:25:26 +00:00
parent 7150ec43c9
commit c69dfc5de4
2 changed files with 1 additions and 9 deletions

View File

@ -120,17 +120,9 @@ $is_iis7 = $is_IIS && intval( substr( $_SERVER['SERVER_SOFTWARE'], strpos( $_SER
/** /**
* Test if the current browser runs on a mobile device (smart phone, tablet, etc.) * Test if the current browser runs on a mobile device (smart phone, tablet, etc.)
* *
* @staticvar bool $is_mobile
*
* @return bool * @return bool
*/ */
function wp_is_mobile() { function wp_is_mobile() {
static $is_mobile = null;
if ( isset( $is_mobile ) ) {
return $is_mobile;
}
if ( empty($_SERVER['HTTP_USER_AGENT']) ) { if ( empty($_SERVER['HTTP_USER_AGENT']) ) {
$is_mobile = false; $is_mobile = false;
} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Mobile') !== false // many mobile devices (all iPhone, iPad, etc.) } elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Mobile') !== false // many mobile devices (all iPhone, iPad, etc.)

View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.5-beta1-36812'; $wp_version = '4.5-beta1-36813';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.