<!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>[18150] trunk/wp-admin/includes/dashboard.php: Check return value of wp_check_browser_version().</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/18150">18150</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-06-05 15:14:51 +0000 (Sun, 05 Jun 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Check return value of wp_check_browser_version(). Make return value consistent. Props duck_, aaroncampbell. fixes <a href="http://trac.wordpress.org/ticket/17682">#17682</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (18149 => 18150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2011-06-05 15:09:44 UTC (rev 18149)
+++ trunk/wp-admin/includes/dashboard.php 2011-06-05 15:14:51 UTC (rev 18150)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">
</span><span class="cx"> $response = wp_check_browser_version();
</span><span class="cx">
</span><del>- if ( $response['upgrade'] ) {
</del><ins>+ if ( $response && $response['upgrade'] ) {
</ins><span class="cx"> add_filter( 'postbox_classes_dashboard_dashboard_browser_nag', 'dashboard_browser_nag_class' );
</span><span class="cx"> if ( $response['insecure'] )
</span><span class="cx"> wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'You are using an insecure browser!' ), 'wp_dashboard_browser_nag' );
</span><span class="lines">@@ -1162,23 +1162,25 @@
</span><span class="cx"> $notice = '';
</span><span class="cx"> $response = wp_check_browser_version();
</span><span class="cx">
</span><del>- if ( $response['insecure'] ) {
- $msg = sprintf( __( 'It looks like you\'re using an insecure version of <a href="%1$s">%2$s</a>. Using an outdated browser makes your computer unsafe. For the best WordPress experience, please update your browser.' ), esc_attr( $response['update_url'] ), esc_html( $response['name'] ) );
- } else {
- $msg = sprintf( __( 'It looks like you\'re using an old version of <a href="%1$s">%2$s</a>. Using an outdated browser makes your computer unsafe. For the best WordPress experience, please update your browser.' ), esc_attr( $response['update_url'] ), esc_html( $response['name'] ) );
- }
</del><ins>+ if ( $response ) {
+ if ( $response['insecure'] ) {
+ $msg = sprintf( __( 'It looks like you\'re using an insecure version of <a href="%1$s">%2$s</a>. Using an outdated browser makes your computer unsafe. For the best WordPress experience, please update your browser.' ), esc_attr( $response['update_url'] ), esc_html( $response['name'] ) );
+ } else {
+ $msg = sprintf( __( 'It looks like you\'re using an old version of <a href="%1$s">%2$s</a>. Using an outdated browser makes your computer unsafe. For the best WordPress experience, please update your browser.' ), esc_attr( $response['update_url'] ), esc_html( $response['name'] ) );
+ }
</ins><span class="cx">
</span><del>- $browser_nag_class = '';
- if ( !empty( $response['img_src'] ) ) {
- $img_src = ( is_ssl() && ! empty( $response['img_src_ssl'] ) )? $response['img_src_ssl'] : $response['img_src'];
</del><ins>+ $browser_nag_class = '';
+ if ( !empty( $response['img_src'] ) ) {
+ $img_src = ( is_ssl() && ! empty( $response['img_src_ssl'] ) )? $response['img_src_ssl'] : $response['img_src'];
</ins><span class="cx">
</span><del>- $notice .= '<div class="alignright browser-icon"><a href="' . esc_attr($response['update_url']) . '"><img src="' . esc_attr( $img_src ) . '" alt="" /></a></div>';
- $browser_nag_class = ' has-browser-icon';
</del><ins>+ $notice .= '<div class="alignright browser-icon"><a href="' . esc_attr($response['update_url']) . '"><img src="' . esc_attr( $img_src ) . '" alt="" /></a></div>';
+ $browser_nag_class = ' has-browser-icon';
+ }
+ $notice .= "<p class='browser-update-nag{$browser_nag_class}'>{$msg}</p>";
+ $notice .= sprintf( __( '<p><a href="%1$s" class="update-browser-link">Update %2$s</a> or learn how to <a href="%3$s" class="browse-happy-link">browse happy</a></p>' ), esc_attr( $response['update_url'] ), esc_html( $response['name'] ), 'http://browsehappy.com/' );
+ $notice .= '<p><a href="" class="dismiss">' . __( 'Dismiss' ) . '</a></p>';
+ $notice .= '<div class="clear"></div>';
</ins><span class="cx"> }
</span><del>- $notice .= "<p class='browser-update-nag{$browser_nag_class}'>{$msg}</p>";
- $notice .= sprintf( __( '<p><a href="%1$s" class="update-browser-link">Update %2$s</a> or learn how to <a href="%3$s" class="browse-happy-link">browse happy</a></p>' ), esc_attr( $response['update_url'] ), esc_html( $response['name'] ), 'http://browsehappy.com/' );
- $notice .= '<p><a href="" class="dismiss">' . __( 'Dismiss' ) . '</a></p>';
- $notice .= '<div class="clear"></div>';
</del><span class="cx">
</span><span class="cx"> echo apply_filters( 'browse-happy-notice', $notice, $response );
</span><span class="cx"> }
</span><span class="lines">@@ -1186,7 +1188,7 @@
</span><span class="cx"> function dashboard_browser_nag_class( $classes ) {
</span><span class="cx"> $response = wp_check_browser_version();
</span><span class="cx">
</span><del>- if ( $response['insecure'] )
</del><ins>+ if ( $response && $response['insecure'] )
</ins><span class="cx"> $classes[] = 'browser-insecure';
</span><span class="cx">
</span><span class="cx"> return $classes;
</span><span class="lines">@@ -1196,8 +1198,13 @@
</span><span class="cx"> * Check if the user needs a browser update
</span><span class="cx"> *
</span><span class="cx"> * @since 3.2
</span><ins>+ *
+ * @return array|bool False on failure, array of browser data on success.
</ins><span class="cx"> */
</span><span class="cx"> function wp_check_browser_version() {
</span><ins>+ if ( empty( $_SERVER['HTTP_USER_AGENT'] ) )
+ return false;
+
</ins><span class="cx"> $key = md5( $_SERVER['HTTP_USER_AGENT'] );
</span><span class="cx">
</span><span class="cx"> if ( false === ($response = get_site_transient('browser_' . $key) ) ) {
</span><span class="lines">@@ -1215,7 +1222,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Response should be an array with:
</span><del>- * 'name' - string- A user friendly browser name
</del><ins>+ * 'name' - string - A user friendly browser name
</ins><span class="cx"> * 'version' - string - The most recent version of the browser
</span><span class="cx"> * 'current_version' - string - The version of the browser the user is using
</span><span class="cx"> * 'upgrade' - boolean - Whether the browser needs an upgrade
</span><span class="lines">@@ -1227,7 +1234,7 @@
</span><span class="cx"> $response = unserialize( wp_remote_retrieve_body( $response ) );
</span><span class="cx">
</span><span class="cx"> if ( ! $response )
</span><del>- return;
</del><ins>+ return false;
</ins><span class="cx">
</span><span class="cx"> set_site_transient( 'browser_' . $key, $response, 604800 ); // cache for 1 week
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>