<!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>[5758] sites/trunk/browsehappy.com/public_html/functions.php: Browse Happy: Pull current browser version number data from Wikidata API rather than parsing Wikimedia markup.</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/5758">5758</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/5758","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-08-07 18:02:51 +0000 (Mon, 07 Aug 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: Pull current browser version number data from Wikidata API rather than parsing Wikimedia markup.
Props Viper007Bond.
See https://github.com/WordPress/browsehappy/pull/39.
Fixes <a href="http://meta.trac.wordpress.org/ticket/2853">#2853</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkbrowsehappycompublic_htmlfunctionsphp">sites/trunk/browsehappy.com/public_html/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkbrowsehappycompublic_htmlfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/browsehappy.com/public_html/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/browsehappy.com/public_html/functions.php 2017-08-06 21:31:29 UTC (rev 5757)
+++ sites/trunk/browsehappy.com/public_html/functions.php 2017-08-07 18:02:51 UTC (rev 5758)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,6 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Google Chrome',
</span><span class="cx" style="display: block; padding: 0 10px"> 'long_name' => 'Google Chrome',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wikipedia' => 'Google_Chrome',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wikidata' => 'Q777',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'normalized' => 1, // just first number
</span><span class="cx" style="display: block; padding: 0 10px"> 'facebook' => 'googlechrome',
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => 'https://www.google.com/chrome',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,6 +20,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Mozilla Firefox',
</span><span class="cx" style="display: block; padding: 0 10px"> 'long_name' => 'Mozilla Firefox',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wikipedia' => 'Firefox',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wikidata' => 'Q698',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'normalized' => 1.5, // include second number if non-zero
</span><span class="cx" style="display: block; padding: 0 10px"> 'facebook' => 'Firefox',
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => 'https://www.firefox.com/',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,6 +30,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Safari',
</span><span class="cx" style="display: block; padding: 0 10px"> 'long_name' => 'Apple Safari',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wikipedia' => 'Safari',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wikidata' => 'Q35773',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'normalized' => 1.5, // include second number if non-zero
</span><span class="cx" style="display: block; padding: 0 10px"> 'facebook' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => 'https://www.apple.com/safari/',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,6 +40,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Opera',
</span><span class="cx" style="display: block; padding: 0 10px"> 'long_name' => 'Opera',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wikipedia' => 'Opera',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wikidata' => 'Q41242',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'normalized' => 1, // just first number
</span><span class="cx" style="display: block; padding: 0 10px"> 'facebook' => 'Opera',
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => 'http://www.opera.com/',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,6 +50,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Microsoft Edge',
</span><span class="cx" style="display: block; padding: 0 10px"> 'long_name' => 'Microsoft Edge',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wikipedia' => 'Microsoft_Edge',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wikidata' => 'Q18698690',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'normalized' => 1, // just first number
</span><span class="cx" style="display: block; padding: 0 10px"> 'facebook' => 'MicrosoftEdge',
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => 'https://www.microsoft.com/en-us/windows/microsoft-edge',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,6 +60,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'Internet Explorer',
</span><span class="cx" style="display: block; padding: 0 10px"> 'long_name' => 'Microsoft Internet Explorer',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wikipedia' => 'Internet_Explorer',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wikidata' => 'Q1575',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'normalized' => 1, // just first number
</span><span class="cx" style="display: block; padding: 0 10px"> 'facebook' => 'internetexplorer',
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => 'http://windows.microsoft.com/ie',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,63 +85,66 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function browsehappy_fetch_version( $browser, $normalize = true ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $fragment = browsehappy_get_browser_data( $browser )->wikipedia;
- if ( ! $fragment )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $fragment = browsehappy_get_browser_data( $browser )->wikidata;
+ if ( ! $fragment ) {
</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"> // Unexpiring transients are autoloaded. We expire these manually on cron instead.
</span><span class="cx" style="display: block; padding: 0 10px"> $stored_version = get_transient( 'browsehappy_version_' . $browser );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false !== $stored_version ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $normalize )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $normalize ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return browsehappy_normalize_version( $browser, $stored_version );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> return $stored_version;
</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">- $url = 'https://en.wikipedia.org/w/api.php?action=query&prop=revisions&rvprop=content&format=php&titles=Template:Latest_stable_software_release/';
- $url .= $fragment;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // See https://github.com/WordPress/browsehappy/issues/37
+ $query = "
+ SELECT ?version WHERE {
+ wd:{$fragment} p:P348 [
+ ps:P348 ?version;
+ pq:P548 wd:Q12355314;
+ wikibase:rank wikibase:PreferredRank
+ ].
+ }
+ LIMIT 1
+ ";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $response = wp_remote_get( $url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $request = wp_remote_get( add_query_arg(
+ array(
+ 'format' => 'json',
+ 'query' => rawurlencode( $query ),
+ ),
+ 'https://query.wikidata.org/bigdata/namespace/wdq/sparql'
+ ) );
</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 ( is_wp_error( $response ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_wp_error( $request ) ) {
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $content = wp_remote_retrieve_body( $response ) )
- return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data = json_decode( wp_remote_retrieve_body( $request ) );
</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 ( ! is_serialized( $content ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (
+ empty( $data ) ||
+ empty( $data->results ) ||
+ ! is_array( $data->results->bindings ) ||
+ empty( $data->results->bindings[0] ) ||
+ empty( $data->results->bindings[0]->version ) ||
+ empty( $data->results->bindings[0]->version->value )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $content = maybe_unserialize( $content );
- $page = array_pop( $content['query']['pages'] );
- $raw_data = explode( "\n", $page['revisions'][0]['*'] );
-
- $version = false;
- foreach( $raw_data as $data ) {
- $data = trim( $data, '| ' );
- if ( false !== strpos( $data, 'Android' ) || false !== strpos( $data, 'iOS' ) )
- continue;
- if ( false !== strpos( $data, 'Linux' ) && false === strpos( $data, 'Mac OS X' ) && false === strpos( $data, 'Windows' ) && false === strpos( $data, 'Microsoft' ) )
- continue;
- if ( ( false !== $pos = strpos( $data, 'latest_release_version' ) ) || ( false !== $pos = strpos( $data, 'latest release version' ) ) ) {
- if ( $pos )
- $data = substr( $data, $pos );
- $version = trim( str_replace( array( 'latest_release_version', 'latest release version', '=' ), '', $data ), '| ' ) . " ";
- $version = str_replace( "'''Mac OS X''' and '''Microsoft Windows'''<br />", '', $version );
- $version = str_replace( "'''Windows 10'''<br>", '', $version );
- $version = substr( $version, 0, strpos( $version, ' ' ) );
- break;
- }
</del><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 === $version )
- return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $version = $data->results->bindings[0]->version->value;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $version = preg_replace( '/[^0-9\.]/', '', $version );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> set_transient( 'browsehappy_version_' . $browser, $version );
</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 ( $normalize )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $normalize ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return browsehappy_normalize_version( $browser, $version );
</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 $version;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,4 +271,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php printf( __( 'Browse Happy is also available in English. <a href="%s">Click here to change the language to English</a>.', 'browsehappy' ), '/?locale=en' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>