Ticket #1206: 1206_2.diff

browsehappy.com/public_html/functions.php

@@ -36 +36 @@
                 'opera' => (object) array(
                         'name' => 'Opera',
                         'long_name' => 'Opera',
-                        'wikipedia' => 'Opera',
+                        'wikipedia' => 'Opera_(web_browser)',
                         'normalized' => 1, // just first number
                         'facebook' => 'Opera',
                         'url' => 'http://www.opera.com/',
@@ -51 +51 @@
                         'url' => 'http://windows.microsoft.com/ie',
                         'info' => __( '“Designed to help you take control of your privacy and browse with confidence. Free from Microsoft.”', 'browsehappy' ),
                 ),
+                'ie-edge' => (object) array(
+                        'name' => 'Microsoft Edge',
+                        'long_name' => 'Microsoft Edge',
+                        'wikipedia' => 'Microsoft_Edge',
+                        'normalized' => 1, // just first number
+                        'facebook' => 'MicrosoftEdge',
+                        'url' => 'https://www.microsoft.com/en-us/windows/microsoft-edge',
+                        'info' => __( '“Microsoft Edge ranks first when put to real world page load tests. Whether you use the web to search, watch or play, this browser won\'t slow you down..”', 'browsehappy' ),
+                ),
+
+
         );
         if ( false === $browser )
                 return $data;
 
         if ( ! isset( $data[ $browser ] ) )
                 return false;
-
         return $data[ $browser ];
 }
 
@@ -69 +79 @@
 }
 
 function browsehappy_fetch_version( $browser, $normalize = true ) {
-
         $fragment = browsehappy_get_browser_data( $browser )->wikipedia;
         if ( ! $fragment )
                 return false;
-
         // Unexpiring transients are autoloaded. We expire these manually on cron instead.
         $stored_version = get_transient( 'browsehappy_version_' . $browser );
-        if ( false !== $stored_version ) {
+        if ( $stored_version ) {
                 if ( $normalize )
                         return browsehappy_normalize_version( $browser, $stored_version );
                 return $stored_version;
         }
 
+
         $url = 'http://en.wikipedia.org/w/api.php?action=query&prop=revisions&rvprop=content&format=php&titles=Template:Latest_stable_software_release/';
         $url .= $fragment;
-
         $response = wp_remote_get( $url );
-
         if ( is_wp_error( $response ) )
                 return false;
 
@@ -105 +112 @@
                 $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' ) )
+                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;
                 }

browsehappy.com/public_html/style.css

@@ -268 +268 @@
 #browserlist li {
         width: 192px;
         float: left;
-        margin: 0;
+        margin: 12px 0 0;
 }
 
 #browserlist li .icon {
@@ -298 +298 @@
         background-position: -500px 0;
 }
 
+#browserlist li#ie-edge .icon {
+        background-position: -628px 0;
+}
+
 #browserlist h2 {
         font: 140%/1 Impact, Helvetica, sans-serif;
         text-align: center;