<!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>[12965] trunk/wp-admin/includes/ms.php: Cleanup admin_notice_feed().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12965">12965</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-05 14:00:18 +0000 (Fri, 05 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cleanup admin_notice_feed(). Props nacin. Fixes <a href="http://trac.wordpress.org/ticket/12138">#12138</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 (12964 => 12965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-02-05 12:45:21 UTC (rev 12964)
+++ trunk/wp-admin/includes/ms.php 2010-02-05 14:00:18 UTC (rev 12965)
</span><span class="lines">@@ -614,34 +614,30 @@
</span><span class="cx"> add_action( 'admin_notices', 'secret_salt_warning' );
</span><span class="cx">
</span><span class="cx"> function admin_notice_feed() {
</span><del>- global $current_user;
- if ( substr( $_SERVER[ 'PHP_SELF' ], -19 ) != '/wp-admin/index.php' )
</del><ins>+ global $current_user, $current_screen;
+ if ( $current_screen->id != 'index' )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if ( isset( $_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><span class="cx">
</span><span class="cx"> $url = get_site_option( 'admin_notice_feed' );
</span><del>- if ( $url == '' )
</del><ins>+ if ( empty( $url ) )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- $rss = @fetch_feed( $url );
- $item = $rss->get_item();
- if ( !is_null( $item ) ) {
</del><ins>+ $rss = fetch_feed( $url );
+ if ( ! is_wp_error( $rss ) && $item = $rss->get_item() ) {
</ins><span class="cx"> $title = $item->get_title();
</span><del>- if ( md5( $title ) == get_user_option( 'admin_feed_dismiss', $current_user->id ) )
</del><ins>+ if ( md5( $title ) == get_user_option( 'admin_feed_dismiss' ) )
</ins><span class="cx"> return;
</span><span class="cx"> $msg = "<h3>" . esc_html( $title ) . "</h3>\n";
</span><span class="cx"> $content = $item->get_description();
</span><del>- if ( is_null( $content ) )
- $content = __( 'something' );
-
- $content = wp_html_excerpt($content, 200) . ' ...';
- $link = clean_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>";
</del><ins>+ $content = $content ? wp_html_excerpt( $content, 200 ) . ' &hellip; ' : '';
+ $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>";
</ins><span class="cx"> echo "<div class='updated fade'>$msg</div>";
</span><span class="cx"> } elseif ( is_super_admin() ) {
</span><del>- printf("<div id='update-nag'>" . __("Your feed at %s is empty.") . "</div>", wp_specialchars( $url ));
</del><ins>+ printf( '<div id="update-nag">' . __( 'Your feed at %s is empty.' ) . '</div>', esc_html( $url ) );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_notices', 'admin_notice_feed' );
</span></span></pre>
</div>
</div>
</body>
</html>