(bug 6428) Incorrect form action URL on Special:Newimages with hidebots = 0 set

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 848ca3e..f5a7a1c 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -553,6 +553,7 @@ Some default configuration options have changed:
   but could be added in the future.
 * (bug 6423) Don't update newtalk flag if page content didn't change (null edits
   were causing the newtalk flag to trigger inappropriately)
+* (bug 6428) Incorrect form action URL on Special:Newimages with hidebots = 0 set
 
 == Compatibility ==
 

diff --git a/includes/SpecialNewimages.php b/includes/SpecialNewimages.php
index 8d7d814..c20f23b 100644 (file)
--- a/includes/SpecialNewimages.php
+++ b/includes/SpecialNewimages.php
@@ -151,10 +151,7 @@ function wfSpecialNewimages( $par, $specialPage ) {
 
        $sub = wfMsg( 'ilsubmit' );
        $titleObj = Title::makeTitle( NS_SPECIAL, 'Newimages' );
-       $action = $titleObj->escapeLocalURL();
-       if(!$hidebots) {
-               $action.='&hidebots=0';
-       }
+       $action = $titleObj->escapeLocalURL( $hidebots ? '' : 'hidebots=0' );
        if ($shownav) {
                $wgOut->addHTML( "<form id=\"imagesearch\" method=\"post\" action=\"" .
                  "{$action}\">" .