<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[14038] trunk/wp-admin/includes/ms.php:
Stop a dismissed admin notice feed from appearing on the next page load.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14038">14038</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-04-08 03:31:51 +0000 (Thu, 08 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop a dismissed admin notice feed from appearing on the next page load. see <a href="http://trac.wordpress.org/ticket/12912">#12912</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (14037 => 14038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-04-08 03:13:48 UTC (rev 14037)
+++ trunk/wp-admin/includes/ms.php 2010-04-08 03:31:51 UTC (rev 14038)
</span><span class="lines">@@ -673,8 +673,10 @@
</span><span class="cx"> if ( $current_screen->id != 'dashboard' )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if ( !empty( $_GET['feed_dismiss'] ) )
</del><ins>+ if ( !empty( $_GET['feed_dismiss'] ) ) {
</ins><span class="cx"> update_user_option( $current_user->id, 'admin_feed_dismiss', $_GET['feed_dismiss'], true );
</span><ins>+ return;
+ }
</ins><span class="cx">
</span><span class="cx"> $url = get_site_option( 'admin_notice_feed' );
</span><span class="cx"> if ( empty( $url ) )
</span><span class="lines">@@ -690,7 +692,7 @@
</span><span class="cx"> $content = $content ? wp_html_excerpt( $content, 200 ) . ' &hellip; ' : '';
</span><span class="cx"> $link = esc_url( strip_tags( $item->get_link() ) );
</span><span class="cx"> $msg .= "<p>" . $content . "<a href='$link'>" . __( 'Read More' ) . "</a> <a href='index.php?feed_dismiss=" . md5( $title ) . "'>" . __( 'Dismiss' ) . "</a></p>";
</span><del>- echo "<div class='updated fade'>$msg</div>";
</del><ins>+ echo "<div class='updated'>$msg</div>";
</ins><span class="cx"> } elseif ( is_super_admin() ) {
</span><span class="cx"> printf( '<div id="update-nag">' . __( 'Your feed at %s is empty.' ) . '</div>', esc_html( $url ) );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>