<!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>[51117] trunk/src/wp-admin: Administration: Introduce dashboard notice to discourage use of out of date browser.</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 { white-space: pre-line; 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="https://core.trac.wordpress.org/changeset/51117">51117</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/51117","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>antpb</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-06-08 22:47:00 +0000 (Tue, 08 Jun 2021)</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'>Administration: Introduce dashboard notice to discourage use of out of date browser.
If a browser matches Internet Explorer, the dashboard will display a notice recommending a more modern browser.
Props youknowriad, sabernhardt, afercia, SergeyBiryukov, davidbaumwald, netweb, johnbillion, jeherve.
See <a href="https://core.trac.wordpress.org/ticket/48743">#48743</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincssdashboardcss">trunk/src/wp-admin/css/dashboard.css</a></li>
<li><a href="#trunksrcwpadminincludesdashboardphp">trunk/src/wp-admin/includes/dashboard.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincssdashboardcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/dashboard.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/dashboard.css 2021-06-08 22:37:34 UTC (rev 51116)
+++ trunk/src/wp-admin/css/dashboard.css 2021-06-08 22:47:00 UTC (rev 51117)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1026,33 +1026,23 @@
</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"> #dashboard_browser_nag p.browser-update-nag.has-browser-icon {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- padding-right: 125px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ padding-right: 128px;
</ins><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"> #dashboard_browser_nag .browser-icon {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- margin-top: -35px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ margin-top: -32px;
</ins><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">-#dashboard_browser_nag.postbox.browser-insecure {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#dashboard_browser_nag.postbox {
</ins><span class="cx" style="display: block; padding: 0 10px"> background-color: #b32d2e;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ background-image: none;
</ins><span class="cx" style="display: block; padding: 0 10px"> border-color: #b32d2e;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
-
-#dashboard_browser_nag.postbox {
- background-color: #dba617;
- background-image: none;
- border-color: #f0c33c;
</del><span class="cx" style="display: block; padding: 0 10px"> color: #fff;
</span><span class="cx" style="display: block; padding: 0 10px"> box-shadow: none;
</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">-#dashboard_browser_nag.postbox.browser-insecure h2 {
- border-bottom-color: #e65054;
- color: #fff;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> #dashboard_browser_nag.postbox h2 {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- border-bottom-color: #f5e6ab;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ border-bottom-color: transparent;
</ins><span class="cx" style="display: block; padding: 0 10px"> background: transparent none;
</span><span class="cx" style="display: block; padding: 0 10px"> color: #fff;
</span><span class="cx" style="display: block; padding: 0 10px"> box-shadow: none;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1062,6 +1052,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> color: #fff;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#dashboard_browser_nag.postbox .postbox-header {
+ border-color: transparent;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> #dashboard_browser_nag h2.hndle {
</span><span class="cx" style="display: block; padding: 0 10px"> border: none;
</span><span class="cx" style="display: block; padding: 0 10px"> font-weight: 600;
</span></span></pre></div>
<a id="trunksrcwpadminincludesdashboardphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/dashboard.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/dashboard.php 2021-06-08 22:37:34 UTC (rev 51116)
+++ trunk/src/wp-admin/includes/dashboard.php 2021-06-08 22:47:00 UTC (rev 51117)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1658,13 +1658,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Displays the browser update nag.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.2.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.8.0 Display special message for Internet Explorer users.
+ *
+ * @global bool $is_IE
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_dashboard_browser_nag() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $is_IE;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $notice = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_check_browser_version();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $response ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $response['insecure'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $is_IE ) {
+ $msg = __( "For the best WordPress experience, please use Microsoft Edge or another modern browser instead of Internet Explorer." );
+ } elseif ( $response['insecure'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $msg = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Browser name and link. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( "It looks like you're using an insecure version of %s. Using an outdated browser makes your computer unsafe. For the best WordPress experience, please update your browser." ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1682,7 +1690,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $response['img_src'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $img_src = ( is_ssl() && ! empty( $response['img_src_ssl'] ) ) ? $response['img_src_ssl'] : $response['img_src'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $notice .= '<div class="alignright browser-icon"><a href="' . esc_attr( $response['update_url'] ) . '"><img src="' . esc_attr( $img_src ) . '" alt="" /></a></div>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $notice .= '<div class="alignright browser-icon"><img src="' . esc_attr( $img_src ) . '" alt="" /></div>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $browser_nag_class = ' has-browser-icon';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $notice .= "<p class='browser-update-nag{$browser_nag_class}'>{$msg}</p>";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1693,13 +1701,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $browsehappy = add_query_arg( 'locale', $locale, $browsehappy );
</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">- $notice .= '<p>' . sprintf(
- /* translators: 1: Browser update URL, 2: Browser name, 3: Browse Happy URL. */
- __( '<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>' ),
- esc_attr( $response['update_url'] ),
- esc_html( $response['name'] ),
- esc_url( $browsehappy )
- ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $is_IE ) {
+ $msg_browsehappy = sprintf(
+ /* translators: %s: Browse Happy URL. */
+ __( 'Learn how to <a href="%s" class="update-browser-link">browse happy</a>' ),
+ esc_url( $browsehappy )
+ );
+ } else {
+ $msg_browsehappy = sprintf(
+ /* translators: 1: Browser update URL, 2: Browser name, 3: Browse Happy URL. */
+ __( '<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>' ),
+ esc_attr( $response['update_url'] ),
+ esc_html( $response['name'] ),
+ esc_url( $browsehappy )
+ );
+ }
+
+ $notice .= '<p>' . $msg_browsehappy . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $notice .= '<p class="hide-if-no-js"><a href="" class="dismiss" aria-label="' . esc_attr__( 'Dismiss the browser warning panel' ) . '">' . __( 'Dismiss' ) . '</a></p>';
</span><span class="cx" style="display: block; padding: 0 10px"> $notice .= '<div class="clear"></div>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>