WP Merge to rev 4349

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@793 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 9 insertions, 4 deletions

diff --git a/wp-admin/index.php b/wp-admin/index.php
index 38b0007..96ab1d5 100644
--- a/wp-admin/index.php
+++ b/wp-admin/index.php
@@ -134,7 +134,8 @@ if (0 < $numcats) $numcats = number_format($numcats);
 $rss = @fetch_rss('http://wordpress.org/development/feed/');
 if ( isset($rss->items) && 0 != count($rss->items) ) {
 ?>
-<h3><?php _e('WordPress Development News'); ?></h3>
+<div id="devnews">
+<h3><?php _e('WordPress Development Blog'); ?></h3>
 <?php
 $rss->items = array_slice($rss->items, 0, 3);
 foreach ($rss->items as $item ) {
@@ -145,24 +146,28 @@ foreach ($rss->items as $item ) {
 	}
 }
 ?>
-
+</div>
 
 <?php
 $rss = @fetch_rss('http://planet.wordpress.org/feed/');
 if ( isset($rss->items) && 0 != count($rss->items) ) {
 ?>
 <div id="planetnews">
-<h3><?php _e('Other WordPress News'); ?> <a href="http://planet.wordpress.org/"><?php _e('more'); ?> &raquo;</a></h3>
+<h3><?php _e('Other WordPress News'); ?></h3>
 <ul>
 <?php
 $rss->items = array_slice($rss->items, 0, 20);
 foreach ($rss->items as $item ) {
+$title = wp_specialchars($item['title']);
+$author = preg_replace( '|(.+?):.+|s', '$1', $item['title'] );
+$post = preg_replace( '|.+?:(.+)|s', '$1', $item['title'] );
 ?>
-<li><a href='<?php echo wp_filter_kses($item['link']); ?>'><?php echo wp_specialchars($item['title']); ?></a></li>
+<li><a href='<?php echo wp_filter_kses($item['link']); ?>'><span class="post"><?php echo $post; ?></span><span class="hidden"> - </span><cite><?php echo $author; ?></cite></a></li>
 <?php
 	}
 ?>
 </ul>
+<p class="readmore"><a href="http://planet.wordpress.org/"><?php _e('Read more'); ?> &raquo;</a></p>
 </div>
 <?php
 }