<!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>[5986] sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0: Browse Happy API: Check for Trident token at a higher priority than MSIE token when determining the version of IE.</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/5986">5986</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/5986","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-10-02 17:04:34 +0000 (Mon, 02 Oct 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: Check for Trident token at a higher priority than MSIE token when determining the version of IE.
Allows proper version of IE to be detected, even if browser mode is employed to emulate another version of IE.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlcorebrowsehappy10parsephp">sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/parse.php</a></li>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlcorebrowsehappy10testsphpunittestsbrowsehappyphp">sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/tests/phpunit/tests/browse-happy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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-10-02 16:01:25 UTC (rev 5985)
+++ sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/parse.php 2017-10-02 17:04:34 UTC (rev 5986)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,26 +147,39 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result['version'][ $key ] = '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $data['version'] = $result['version'][ $key ];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'MSIE' == $result['name'][0] ) {
- if ( $key = array_search( 'IEMobile', $result['name'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+ // Trident (Internet Explorer)
+ elseif ( false !== ( $key = array_search( 'Trident', $result['name'] ) ) ) {
+ // IE 8-10 more reliably report version via Trident token than MSIE token.
+ // IE 11 uses Trident token without an MSIE token.
+ // https://msdn.microsoft.com/library/hh869301(v=vs.85).aspx
+ if ( $key2 = array_search( 'IEMobile', $result['name'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data['name'] = 'Internet Explorer Mobile';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data['version'] = $result['version'][ $key2 ];
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $data['name'] = 'Internet Explorer';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $key = 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $trident_ie_mapping = array(
+ '4.0' => '8.0',
+ '5.0' => '9.0',
+ '6.0' => '10.0',
+ '7.0' => '11.0',
+ );
+ $ver = $result['version'][ $key ];
+ $data['version'] = $trident_ie_mapping[ $ver ] ?? $ver;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+ // Internet Explorer (pre v8.0)
+ elseif ( 'MSIE' == $result['name'][0] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $key = array_search( 'IEMobile', $result['name'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data['name'] = 'Internet Explorer Mobile';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $data['name'] = 'Internet Explorer';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $key = 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 ( '7.0' == $result['version'][0] ) {
- $data['version'] = '11.0';
- }
- } else {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data['version'] = $result['version'][ $key ];
+ }
+ // Fall back to whatever is being reported.
+ else {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data['name'] = $result['name'][0];
</span><span class="cx" style="display: block; padding: 0 10px"> $data['version'] = $result['version'][0];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkapiwordpressorgpublic_htmlcorebrowsehappy10testsphpunittestsbrowsehappyphp"></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/tests/phpunit/tests/browse-happy.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/tests/phpunit/tests/browse-happy.php 2017-10-02 16:01:25 UTC (rev 5985)
+++ sites/trunk/api.wordpress.org/public_html/core/browse-happy/1.0/tests/phpunit/tests/browse-happy.php 2017-10-02 17:04:34 UTC (rev 5986)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,6 +262,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Mozilla/5.0 (Windows NT 6.3; Trident/7.0; rv:11.0) like Gecko',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Windows Internet Explorer 11.0',
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ [ // Fictitious Trident version
+ 'Mozilla/5.0 (Windows NT 6.3; Trident/34.0; rv:38.0) like Gecko',
+ 'Windows Internet Explorer 34.0',
+ ],
</ins><span class="cx" style="display: block; padding: 0 10px"> [
</span><span class="cx" style="display: block; padding: 0 10px"> 'Mozilla/4.0 (compatible; MSIE 7.0; Windows Phone OS 7.0; Trident/3.1; IEMobile/7.0) Asus;Galaxy6',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Windows Phone OS Internet Explorer Mobile 7.0',
</span></span></pre>
</div>
</div>
</body>
</html>