Revert r45490 per http://www.mediawiki.org/wiki/Special:Code/MediaWiki/45490

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e22d675..34ba8cd 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -26,7 +26,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 === New features in 1.15 ===
 
 * (bug 2242) Add an expiry time to temporary passwords
-* Added "Advanced search" link to the search form
 * Special:Upload can now have a custom upload message instead of uploadtext by
   passing "uploadmsg" parameter in the url
 * (bug 9947) Add PROTECTIONLEVEL parser function to return the protection level

diff --git a/includes/Skin.php b/includes/Skin.php
index fd3e85f..3edcd92 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1148,8 +1148,7 @@ END;
                  . '<input type="text" id="searchInput'.$this->searchboxes.'" name="search" size="19" value="'
                  . htmlspecialchars(substr($search,0,256)) . "\" />\n"
                  . '<input type="submit" name="go" value="' . wfMsg ('searcharticle') . '" />&nbsp;'
-                 . '<input type="submit" name="fulltext" value="' . wfMsg ('searchbutton') . "\" />\n"
-                 . '<a href="' . $this->escapeSearchLink() . '" rel="search">' . wfMsg ('powersearch-legend') . '</a></form>';
+                 . '<input type="submit" name="fulltext" value="' . wfMsg ('searchbutton') . "\" />\n</form>";
 
                // Ensure unique id's for search boxes made after the first
                $this->searchboxes = $this->searchboxes == '' ? 2 : $this->searchboxes + 1;

diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index cd93e1f..f3806dc 100644 (file)
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -299,8 +299,7 @@ class SkinCologneBlue extends Skin {
                $s .= "<input type='text' id=\"searchInput{$this->searchboxes}\" class=\"mw-searchInput\" name=\"search\" size=\"14\" value=\""
                  . htmlspecialchars(substr($search,0,256)) . "\" /><br />"
                  . "<input type='submit' id=\"searchGoButton{$this->searchboxes}\" class=\"searchButton\" name=\"go\" value=\"" . htmlspecialchars( wfMsg( "searcharticle" ) ) . "\" />"
-                 . "<input type='submit' id=\"mw-searchButton{$this->searchboxes}\" class=\"searchButton\" name=\"fulltext\" value=\"" . htmlspecialchars( wfMsg( "search" ) ) . "\" />\n"
-                 . '<a href="$action" rel="search">' . wfMsg ('powersearch-legend') . '</a></form>';
+                 . "<input type='submit' id=\"mw-searchButton{$this->searchboxes}\" class=\"searchButton\" name=\"fulltext\" value=\"" . htmlspecialchars( wfMsg( "search" ) ) . "\" /></form>";
 
                // Ensure unique id's for search boxes made after the first
                $this->searchboxes = $this->searchboxes == '' ? 2 : $this->searchboxes + 1;

diff --git a/skins/Modern.php b/skins/Modern.php
index c16ae47..cb24baf 100644 (file)
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -256,7 +256,6 @@ class ModernTemplate extends QuickTemplate {
                                                ?> value="<?php $this->text('search') ?>"<?php } ?> />
                                <input type='submit' name="go" class="searchButton" id="searchGoButton" value="<?php $this->msg('searcharticle') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-go' ); ?> />&nbsp;
                                <input type='submit' name="fulltext" class="searchButton" id="mw-searchButton" value="<?php $this->msg('searchbutton') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?> />
-                               <a href="<?php $this->text('searchaction') ?>" rel="search"><?php $this->msg('powersearch-legend') ?></a>
                        </div></form>
                </div><!-- pBody -->
        </div><!-- portlet -->

diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index 62d98ba..8afc498 100644 (file)
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -259,7 +259,6 @@ class MonoBookTemplate extends QuickTemplate {
                                                ?> value="<?php $this->text('search') ?>"<?php } ?> />
                                <input type='submit' name="go" class="searchButton" id="searchGoButton" value="<?php $this->msg('searcharticle') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-go' ); ?> />&nbsp;
                                <input type='submit' name="fulltext" class="searchButton" id="mw-searchButton" value="<?php $this->msg('searchbutton') ?>"<?php echo $this->skin->tooltipAndAccesskey( 'search-fulltext' ); ?> />
-                               <a href="<?php $this->text('searchaction') ?>" rel="search"><?php $this->msg('powersearch-legend') ?></a>
                        </div></form>
                </div>
        </div>

diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index c89e77e..7e5809b 100644 (file)
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -715,9 +715,7 @@ input.searchButton {
        padding: .5em .4em .4em .4em;
        text-align: center;
 }
-#p-search a {
-       font-size: 95%;
-}
+
 /*
 ** the personal toolbar
 */