golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Stop a dismissed admin notice feed from appearing on the next page load. see #12912. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@14038 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-04-08 03:31:51 +00:00
parent cfee8704b2
commit 9ebf0afe13
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/includes/ms.php
View File

@ -673,8 +673,10 @@ function admin_notice_feed() {
if ( $current_screen->id != 'dashboard' )
return;
if ( !empty( $_GET['feed_dismiss'] ) )
if ( !empty( $_GET['feed_dismiss'] ) ) {
update_user_option( $current_user->id, 'admin_feed_dismiss', $_GET['feed_dismiss'], true );
return;
}
$url = get_site_option( 'admin_notice_feed' );
if ( empty( $url ) )
@ -690,7 +692,7 @@ function admin_notice_feed() {
$content = $content ? wp_html_excerpt( $content, 200 ) . ' … ' : '';
$link = esc_url( strip_tags( $item->get_link() ) );
$msg .= "<p>" . $content . "<a href='$link'>" . __( 'Read More' ) . "</a> <a href='index.php?feed_dismiss=" . md5( $title ) . "'>" . __( 'Dismiss' ) . "</a></p>";
echo "<div class='updated fade'>$msg</div>";
echo "<div class='updated'>$msg</div>";
} elseif ( is_super_admin() ) {
printf( '<div id="update-nag">' . __( 'Your feed at %s is empty.' ) . '</div>', esc_html( $url ) );
}