jenkins-bot has submitted this change and it was merged.

Change subject: CologneBlue: Use search input and button generators from 
SkinTemplate
......................................................................


CologneBlue: Use search input and button generators from SkinTemplate

This also makes sure that the search inputs receive their placeholder,
which fixes bug 47475.

Bug: 47475

Change-Id: Ie1215078edb38f98ec57d2a3ec46b1d0ace0bc30
---
M skins/CologneBlue.php
1 file changed, 4 insertions(+), 5 deletions(-)

Approvals:
  Matmarex: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index d766b64..5ae8843 100644
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -541,13 +541,12 @@
                        $s .= wfMessage( 'qbfind' )->text() . ": ";
                }
 
-               $s .= "<input type='text' class=\"mw-searchInput\" 
name=\"search\" size=\"14\" value=\""
-                       . htmlspecialchars( substr( $search, 0, 256 ) ) . "\" 
/>"
-                       . ( $which == 'footer' ? " " : "<br />" )
-                       . "<input type='submit' class=\"searchButton\" 
name=\"go\" value=\"" . wfMessage( 'searcharticle' )->escaped() . "\" />";
+               $s .= $this->makeSearchInput( array( 'class' => 
'mw-searchInput', 'type' => 'text', 'size' => '14' ) );
+               $s .= ( $which == 'footer' ? " " : "<br />" );
+               $s .= $this->makeSearchButton( 'go', array( 'class' => 
'searchButton' ) );
 
                if ( $wgUseTwoButtonsSearchForm ) {
-                       $s .= " <input type='submit' class=\"searchButton\" 
name=\"fulltext\" value=\"" . wfMessage( 'searchbutton' )->escaped() . "\" 
/>\n";
+                       $s .= $this->makeSearchButton( 'fulltext', array( 
'class' => 'searchButton' ) );
                } else {
                        $s .= '<div><a href="' . $action . '" rel="search">' . 
wfMessage( 'powersearch-legend' )->escaped() . "</a></div>\n";
                }

-- 
To view, visit https://gerrit.wikimedia.org/r/60212
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1215078edb38f98ec57d2a3ec46b1d0ace0bc30
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TheDJ <[email protected]>
Gerrit-Reviewer: Brian Wolff <[email protected]>
Gerrit-Reviewer: Daniel Friesen <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Matmarex <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Waldir <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to