| Index: branches/REL1_5/phase3/skins/CologneBlue.php |
| — | — | @@ -16,6 +16,8 @@ |
| 17 | 17 | * @subpackage Skins |
| 18 | 18 | */ |
| 19 | 19 | class SkinCologneBlue extends Skin { |
| | 20 | + # We have several search form. Make sure they have different id |
| | 21 | + var $searchFormCount = '' ; |
| 20 | 22 | |
| 21 | 23 | function getStylesheet() { |
| 22 | 24 | return "common/cologneblue.css"; |
| — | — | @@ -300,17 +302,17 @@ |
| 301 | 303 | |
| 302 | 304 | function searchForm( $label = "" ) |
| 303 | 305 | { |
| 304 | | - global $wgRequest; |
| | 306 | + global $wgRequest, $searchFormCount; |
| 305 | 307 | |
| 306 | 308 | $search = $wgRequest->getText( 'search' ); |
| 307 | 309 | $action = $this->escapeSearchLink(); |
| 308 | | - $s = "<form id=\"search\" method=\"get\" class=\"inline\" action=\"$action\">"; |
| | 310 | + $s = "<form id=\"searchForm{$searchFormCount}\" method=\"get\" class=\"inline\" action=\"$action\">"; |
| 309 | 311 | if ( "" != $label ) { $s .= "{$label}: "; } |
| 310 | 312 | |
| 311 | | - $s .= "<input type='text' name=\"search\" size='14' value=\"" |
| | 313 | + $s .= "<input type='text' name=\"searchInput{$searchFormCount}\" size='14' value=\"" |
| 312 | 314 | . htmlspecialchars(substr($search,0,256)) . "\" />" |
| 313 | 315 | . "<br /><input type='submit' name=\"go\" value=\"" . htmlspecialchars( wfMsg( "go" ) ) . "\" /> <input type='submit' name=\"fulltext\" value=\"" . htmlspecialchars( wfMsg( "search" ) ) . "\" /></form>"; |
| 314 | | - |
| | 316 | + $searchFormCount++; |
| 315 | 317 | return $s; |
| 316 | 318 | } |
| 317 | 319 | } |
| Index: branches/REL1_5/phase3/RELEASE-NOTES |
| — | — | @@ -1011,6 +1011,8 @@ |
| 1012 | 1012 | * (bug 4510) Correct Barnes & Noble bookstore URLs |
| 1013 | 1013 | * (bug 4504) Use site language for namespace name resolution |
| 1014 | 1014 | * (bug 4530) Fix Kurdish language name |
| | 1015 | +* (bug 2571) Duplicate anchors and missing form id tag in search form on |
| | 1016 | + Cologne Blue skin |
| 1015 | 1017 | |
| 1016 | 1018 | === Caveats === |
| 1017 | 1019 | |