Ticket #9402: more_validation_fixes.patch

import/blogger.php

@@ -245 +245 @@
                                 kick: function() {
                                         ++this.kicks;
                                         var i = this.blog;
-                                        jQuery.post('admin.php?import=blogger&noheader=true',{blog:this.blog},function(text,result){blogs[i].kickd(text,result)});
+                                        jQuery.post('admin.php?import=blogger&noheader=true',{blog:this.blog},function(text,result){blogs[i].kickd(text,result)});
                                 },
                                 check: function() {
                                         ++this.checks;
                                         var i = this.blog;
-                                        jQuery.post('admin.php?import=blogger&noheader=true&status=true',{blog:this.blog},function(text,result){blogs[i].checkd(text,result)});
+                                        jQuery.post('admin.php?import=blogger&noheader=true&status=true',{blog:this.blog},function(text,result){blogs[i].checkd(text,result)});
                                 },
                                 kickd: function(text, result) {
                                         if ( result == 'error' ) {
@@ -305 +305 @@
                                                 jQuery('div.wrap').gt(0).remove();
                                         jQuery('div.wrap').empty().append('<h2>$authhead</h2><h3>' + this.title + '</h3>');
                                         jQuery('div.wrap').append('<p id=\"auth\">$loadauth</p>');
-                                        jQuery('p#auth').load('index.php?import=blogger&noheader=true&authors=1',{blog:this.blog});
+                                        jQuery('p#auth').load('index.php?import=blogger&amp;noheader=true&amp;authors=1',{blog:this.blog});
                                 },
                                 init: function() {
                                         this.update();
@@ -330 +330 @@
                                                         jQuery(this.button).attr('value', strings.cont);
                                                 }
                                         } else if ( this.mode == 'authors' ) {
-                                                document.location = 'index.php?import=blogger&authors=1&blog='+this.blog;
+                                                document.location = 'index.php?import=blogger&amp;authors=1&amp;blog='+this.blog;
                                                 //this.mode = 'authors2';
                                                 //this.getauthors();
                                         }

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();
 
@@ -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";