Ticket #7131: dashboard.diff

opt/lampp/htdocs/wordpress/wp-admin/includes/dashboard.php

@@ -36 +36 @@
                 $update = true;
                 $widget_options['dashboard_incoming_links'] = array(
                         'home' => get_option('home'),
-                        'link' => apply_filters( 'dashboard_incoming_links_link', 'http://blogsearch.google.com/blogsearch?hl=en&scoring=d&partner=wordpress&q=link:' . trailingslashit( get_option('home') ) ),
-                        'url' => isset($widget_options['dashboard_incoming_links']['url']) ? apply_filters( 'dashboard_incoming_links_feed', $widget_options['dashboard_incoming_links']['url'] ) : apply_filters( 'dashboard_incoming_links_feed', 'http://blogsearch.google.com/blogsearch_feeds?hl=en&scoring=d&ie=utf-8&num=20&output=rss&partner=wordpress&q=link:' . trailingslashit( get_option('home') ) ),
+                        'link' => apply_filters( 'dashboard_incoming_links_link', 'http://blogsearch.google.com/blogsearch?hl=en&scoring=d&partner=wordpress&q=link:' . trailingslashit( get_option('home') ) ),
+                        'url' => isset($widget_options['dashboard_incoming_links']['url']) ? apply_filters( 'dashboard_incoming_links_feed', $widget_options['dashboard_incoming_links']['url'] ) : apply_filters( 'dashboard_incoming_links_feed', 'http://blogsearch.google.com/blogsearch_feeds?hl=en&scoring=d&ie=utf-8&num=20&output=rss&partner=wordpress&q=link:' . trailingslashit( get_option('home') ) ),
                         'items' => isset($widget_options['dashboard_incoming_links']['items']) ? $widget_options['dashboard_incoming_links']['items'] : 10,
                         'show_date' => isset($widget_options['dashboard_incoming_links']['show_date']) ? $widget_options['dashboard_incoming_links']['show_date'] : false
                 );
@@ -512 +512 @@
         $comment_post_link = "<a href='$comment_post_url'>$comment_post_title</a>";
         $comment_link = '<a class="comment-link" href="' . get_comment_link() . '">#</a>';
 
-        $delete_url = clean_url( wp_nonce_url( "comment.php?action=deletecomment&p=$comment->comment_post_ID&c=$comment->comment_ID", "delete-comment_$comment->comment_ID" ) );
-        $approve_url = clean_url( wp_nonce_url( "comment.php?action=approvecomment&p=$comment->comment_post_ID&c=$comment->comment_ID", "approve-comment_$comment->comment_ID" ) );
-        $unapprove_url = clean_url( wp_nonce_url( "comment.php?action=unapprovecomment&p=$comment->comment_post_ID&c=$comment->comment_ID", "unapprove-comment_$comment->comment_ID" ) );
-        $spam_url = clean_url( wp_nonce_url( "comment.php?action=deletecomment&dt=spam&p=$comment->comment_post_ID&c=$comment->comment_ID", "delete-comment_$comment->comment_ID" ) );
+        $delete_url = clean_url( wp_nonce_url( "comment.php?action=deletecomment&amp;p=$comment->comment_post_ID&amp;c=$comment->comment_ID", "delete-comment_$comment->comment_ID" ) );
+        $approve_url = clean_url( wp_nonce_url( "comment.php?action=approvecomment&amp;p=$comment->comment_post_ID&amp;c=$comment->comment_ID", "approve-comment_$comment->comment_ID" ) );
+        $unapprove_url = clean_url( wp_nonce_url( "comment.php?action=unapprovecomment&amp;p=$comment->comment_post_ID&amp;c=$comment->comment_ID", "unapprove-comment_$comment->comment_ID" ) );
+        $spam_url = clean_url( wp_nonce_url( "comment.php?action=deletecomment&amp;dt=spam&amp;p=$comment->comment_post_ID&amp;c=$comment->comment_ID", "delete-comment_$comment->comment_ID" ) );
 
         $actions = array();
 
@@ -639 +639 @@
                         $publisher = "<strong>$publisher</strong>";
 
                 $content = $item->get_content();
-                $content = wp_html_excerpt($content, 50) . ' ...';
+                $content = wp_html_excerpt($content, 50) . ' &hellip;';
 
                 if ( $link )
                         /* translators: incoming links feed, %1$s is other person, %3$s is content */
@@ -802 +802 @@
 
                 $description = wp_specialchars( strip_tags(html_entity_decode($item->get_description(), ENT_QUOTES, get_option('blog_charset'))) );
 
-                $ilink = wp_nonce_url('plugin-install.php?tab=plugin-information&plugin=' . $slug, 'install-plugin_' . $slug) .
+                $ilink = wp_nonce_url('plugin-install.php?tab=plugin-information&amp;plugin=' . $slug, 'install-plugin_' . $slug) .
                                                         '&amp;TB_iframe=true&amp;width=600&amp;height=800';
 
                 echo "<h4>$label</h4>\n";