<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[5934] sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0: Browse Happy API: Whitespace changes.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/5934">5934</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/5934","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coffee2code</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-09-18 19:53:25 +0000 (Mon, 18 Sep 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Browse Happy API: Whitespace changes.
* Changes leading spaces to tabs
* Adds braces to single-line conditionals
* Aligns associative array elements
* Removes trailing spaces</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlcorebrowsehappy10browsersphp">sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/browsers.php</a></li>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlcorebrowsehappy10indexphp">sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/index.php</a></li>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlcorebrowsehappy10parsephp">sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/parse.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkapiwordpressorgpublic_htmlcorebrowsehappy10browsersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/browsers.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/browsers.php 2017-09-16 13:00:40 UTC (rev 5933)
+++ sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/browsers.php 2017-09-18 19:53:25 UTC (rev 5934)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,52 +29,54 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Internet Explorer' => (object) array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => 'Internet Explorer',
- 'wikipedia' => 'Internet_Explorer',
- 'normalized' => 1, // just first number
- 'url' => 'http://www.microsoft.com/windows/internet-explorer/',
- 'img_src' => $http . 'ie.png',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => 'Internet Explorer',
+ 'wikipedia' => 'Internet_Explorer',
+ 'normalized' => 1, // just first number
+ 'url' => 'http://www.microsoft.com/windows/internet-explorer/',
+ 'img_src' => $http . 'ie.png',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'img_src_ssl' => $https . 'ie.png',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'Firefox' => (object) array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => 'Mozilla Firefox',
- 'wikipedia' => 'Firefox',
- 'normalized' => 1.5, // include second number if non-zero
- 'url' => 'http://www.firefox.com/',
- 'img_src' => $http . 'firefox.png',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => 'Mozilla Firefox',
+ 'wikipedia' => 'Firefox',
+ 'normalized' => 1.5, // include second number if non-zero
+ 'url' => 'http://www.firefox.com/',
+ 'img_src' => $http . 'firefox.png',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'img_src_ssl' => $https . 'firefox.png',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'Safari' => (object) array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => 'Safari',
- 'wikipedia' => 'Safari',
- 'normalized' => 1.5, // include second number if non-zero
- 'url' => 'http://www.apple.com/safari/',
- 'img_src' => $http . 'safari.png',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => 'Safari',
+ 'wikipedia' => 'Safari',
+ 'normalized' => 1.5, // include second number if non-zero
+ 'url' => 'http://www.apple.com/safari/',
+ 'img_src' => $http . 'safari.png',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'img_src_ssl' => $https . 'safari.png',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'Opera' => (object) array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => 'Opera',
- 'wikipedia' => 'Opera',
- 'normalized' => 2, // include second number
- 'url' => 'http://www.opera.com/',
- 'img_src' => $http . 'opera.png',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => 'Opera',
+ 'wikipedia' => 'Opera',
+ 'normalized' => 2, // include second number
+ 'url' => 'http://www.opera.com/',
+ 'img_src' => $http . 'opera.png',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'img_src_ssl' => $https . 'opera.png',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'Chrome' => (object) array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => 'Google Chrome',
- 'wikipedia' => 'Google_Chrome',
- 'normalized' => 1, // just first number
- 'url' => 'http://www.google.com/chrome',
- 'img_src' => $http . 'chrome.png',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => 'Google Chrome',
+ 'wikipedia' => 'Google_Chrome',
+ 'normalized' => 1, // just first number
+ 'url' => 'http://www.google.com/chrome',
+ 'img_src' => $http . 'chrome.png',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'img_src_ssl' => $https . 'chrome.png',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === $browser )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false === $browser ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $data;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! isset( $data[ $browser ] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $data[ $browser ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $data[ $browser ];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkapiwordpressorgpublic_htmlcorebrowsehappy10indexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/index.php 2017-09-16 13:00:40 UTC (rev 5933)
+++ sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/index.php 2017-09-18 19:53:25 UTC (rev 5934)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,8 +11,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Content-Type: application/javascript' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( empty( $_REQUEST['useragent'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( empty( $_REQUEST['useragent'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user_agent = $_REQUEST['useragent'];
</span><span class="cx" style="display: block; padding: 0 10px"> $data = browsehappy_parse_user_agent( $user_agent );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,12 +24,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> bh_record_data( $user_agent, $data );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( $jsonp )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( $jsonp ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo $jsonp.'('.json_encode($data).')';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-elseif ( defined( 'JSON_RESPONSE' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( defined( 'JSON_RESPONSE' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo json_encode( $data );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-else
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} else {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo serialize( $data );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function bh_record_data( $ua, $data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span></span></pre></div>
<a id="sitestrunkapiwordpressorgpublic_htmlcorebrowsehappy10parsephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/parse.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/parse.php 2017-09-16 13:00:40 UTC (rev 5933)
+++ sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/parse.php 2017-09-18 19:53:25 UTC (rev 5934)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,77 +15,89 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function browsehappy_parse_user_agent( $user_agent ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( preg_match('/^.+?(?P<platform>Android|iPhone|iPad|Windows|Linux|Macintosh|Windows Phone OS|RIM Tablet OS|PlayBook)(?: NT)*(?: [ix]?[0-9._]+)*(;|\))/im', $user_agent, $regs ) )
- $data['platform'] = $regs['platform'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( preg_match(
+ '/^.+?(?P<platform>Android|iPhone|iPad|Windows|Linux|Macintosh|Windows Phone OS|RIM Tablet OS|PlayBook)(?: NT)*(?: [ix]?[0-9._]+)*(;|\))/im',
+ $user_agent,
+ $regs
+ ) ) {
+ $data['platform'] = $regs['platform'];
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- preg_match_all( '%(?P<name>Trident|Camino|Kindle|Firefox|(?:Mobile )?Safari|MSIE|RockMelt|AppleWebKit|Chrome|IEMobile|Opera|Version)(?:[/ ])(?P<version>[0-9.]+)%im', $user_agent, $result, PREG_PATTERN_ORDER );
-
- // If Version/x.x.x was specified in UA string store it and ignore it
- if ( $key = array_search( 'Version', $result['name'] ) ) {
- $version = $result['version'][ $key ];
- unset( $result['name'][ $key ] );
- unset( $result['version'][ $key ] );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ preg_match_all(
+ '%(?P<name>Trident|Camino|Kindle|Firefox|(?:Mobile )?Safari|MSIE|RockMelt|AppleWebKit|Chrome|IEMobile|Opera|Version)(?:[/ ])(?P<version>[0-9.]+)%im',
+ $user_agent,
+ $result,
+ PREG_PATTERN_ORDER
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'AppleWebKit' == $result['name'][0] ) {
- if ( $key = array_search( 'Mobile Safari', $result['name'] ) ) {
- $data['name'] = 'Mobile Safari';
- // } elseif ( ( 'Android' == $data['platform'] && !($key = 0) ) || $key = array_search( 'Chrome', $result['name'] ) ) {
- } elseif ( $key = array_search( 'RockMelt', $result['name'] ) ) {
- $data['name'] = 'RockMelt';
- } elseif ( $key = array_search( 'Chrome', $result['name'] ) ) {
- $data['name'] = 'Chrome';
- } elseif ( ! empty( $data['platform'] ) && 'PlayBook' == $data['platform'] ) {
- $data['name'] = 'PlayBook';
- } elseif ( $key = array_search( 'Kindle', $result['name'] ) ) {
- $data['name'] = 'Kindle';
- } elseif ( $key = array_search( 'Safari', $result['name'] ) ) {
- $data['name'] = 'Safari';
- } else {
- $key = 0;
- $data['name'] = 'webkit';
- }
- $data['version'] = $result['version'][ $key ];
- } elseif ( $key = array_search( 'Opera', $result['name'] ) ) {
- $data['name'] = $result['name'][$key];
- $data['version'] = $result['version'][ $key ];
- } elseif ( 'MSIE' == $result['name'][0] ) {
- if ( $key = array_search( 'IEMobile', $result['name'] ) ) {
- $data['name'] = 'Internet Explorer Mobile';
- } else {
- $data['name'] = 'Internet Explorer';
- $key = 0;
- }
- $data['version'] = $result['version'][ $key ];
- } elseif ( 'Trident' == $result['name'][0] ) {
- // IE 11 and beyond have switched to Trident
- // http://msdn.microsoft.com/en-us/library/ie/hh869301%28v=vs.85%29.aspx
- $data['name'] = 'Internet Explorer';
- if( '7.0' == $result['version'][0] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If Version/x.x.x was specified in UA string store it and ignore it
+ if ( $key = array_search( 'Version', $result['name'] ) ) {
+ $version = $result['version'][ $key ];
+ unset( $result['name'][ $key ] );
+ unset( $result['version'][ $key ] );
+ }
+
+ if ( 'AppleWebKit' == $result['name'][0] ) {
+ if ( $key = array_search( 'Mobile Safari', $result['name'] ) ) {
+ $data['name'] = 'Mobile Safari';
+ // } elseif ( ( 'Android' == $data['platform'] && !($key = 0) ) || $key = array_search( 'Chrome', $result['name'] ) ) {
+ } elseif ( $key = array_search( 'RockMelt', $result['name'] ) ) {
+ $data['name'] = 'RockMelt';
+ } elseif ( $key = array_search( 'Chrome', $result['name'] ) ) {
+ $data['name'] = 'Chrome';
+ } elseif ( ! empty( $data['platform'] ) && 'PlayBook' == $data['platform'] ) {
+ $data['name'] = 'PlayBook';
+ } elseif ( $key = array_search( 'Kindle', $result['name'] ) ) {
+ $data['name'] = 'Kindle';
+ } elseif ( $key = array_search( 'Safari', $result['name'] ) ) {
+ $data['name'] = 'Safari';
+ } else {
+ $key = 0;
+ $data['name'] = 'webkit';
+ }
+ $data['version'] = $result['version'][ $key ];
+ } elseif ( $key = array_search( 'Opera', $result['name'] ) ) {
+ $data['name'] = $result['name'][ $key ];
+ $data['version'] = $result['version'][ $key ];
+ } elseif ( 'MSIE' == $result['name'][0] ) {
+ if ( $key = array_search( 'IEMobile', $result['name'] ) ) {
+ $data['name'] = 'Internet Explorer Mobile';
+ } else {
+ $data['name'] = 'Internet Explorer';
+ $key = 0;
+ }
+ $data['version'] = $result['version'][ $key ];
+ } elseif ( 'Trident' == $result['name'][0] ) {
+ // IE 11 and beyond have switched to Trident
+ // http://msdn.microsoft.com/en-us/library/ie/hh869301%28v=vs.85%29.aspx
+ $data['name'] = 'Internet Explorer';
+ if( '7.0' == $result['version'][0] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data['version'] = '11';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data['name'] = $result['name'][0];
- $data['version'] = $result['version'][0];
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data['name'] = $result['name'][0];
+ $data['version'] = $result['version'][0];
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $data['name'], array( 'Kindle' ) ) )
- $data['platform'] = $data['name'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $data['name'], array( 'Kindle' ) ) ) {
+ $data['platform'] = $data['name'];
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $data['platform'], array( 'Android', 'iPad', 'iPhone' ) ) )
- $data['name'] = $data['platform'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $data['platform'], array( 'Android', 'iPad', 'iPhone' ) ) ) {
+ $data['name'] = $data['platform'];
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If Version/x.x.x was specified in UA string
- if ( ! empty( $version ) )
- $data['version'] = $version;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If Version/x.x.x was specified in UA string
+ if ( ! empty( $version ) ) {
+ $data['version'] = $version;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $browser_data = browsehappy_api_get_browser_data( $data['name'] );
- $data['update_url'] = $browser_data ? $browser_data->url : '';
- $data['img_src'] = $browser_data ? $browser_data->img_src : '';
- $data['img_src_ssl'] = $browser_data ? $browser_data->img_src_ssl : '';
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $browser_data = browsehappy_api_get_browser_data( $data['name'] );
+ $data['update_url'] = $browser_data ? $browser_data->url : '';
+ $data['img_src'] = $browser_data ? $browser_data->img_src : '';
+ $data['img_src_ssl'] = $browser_data ? $browser_data->img_src_ssl : '';
</ins><span class="cx" style="display: block; padding: 0 10px"> $data['current_version'] = get_browser_version_from_name( $data['name'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data['upgrade'] = ( !empty( $data['current_version'] ) && version_compare( $data['version'], $data['current_version'], '<' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data['upgrade'] = ( ! empty( $data['current_version'] ) && version_compare( $data['version'], $data['current_version'], '<' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $data['insecure'] = ( 'Internet Explorer' == $data['name'] && version_compare( $data['version'], '8', '<' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $data;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,4 +108,3 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return isset( $versions[ $name ] ) ? $versions[ $name ] : '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del></span></pre>
</div>
</div>
</body>
</html>