Merge "Add (hacky) check for webm audio files"

[lhc/web/wiklou.git] / includes / specials / SpecialUndelete.php

diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php
index eb4f0cc..864ea0f 100644 (file)
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -21,7 +21,6 @@
  * @ingroup SpecialPage
  */
 
-use MediaWiki\MediaWikiServices;
 use Wikimedia\Rdbms\ResultWrapper;
 
 /**
@@ -236,6 +235,7 @@ class SpecialUndelete extends SpecialPage {
        function showSearchForm() {
                $out = $this->getOutput();
                $out->setPageTitle( $this->msg( 'undelete-search-title' ) );
+               $fuzzySearch = $this->getRequest()->getVal( "fuzzy", false );
                $out->addHTML(
                        Xml::openElement( 'form', [ 'method' => 'get', 'action' => wfScript() ] ) .
                                Xml::fieldset( $this->msg( 'undelete-search-box' )->text() ) .
@@ -244,7 +244,8 @@ class SpecialUndelete extends SpecialPage {
                                Html::rawElement(
                                        'label',
                                        [ 'for' => 'prefix' ],
-                                       $this->msg( 'undelete-search-prefix' )->parse()
+                                       $this->msg( $fuzzySearch ? 'undelete-search-full' : 'undelete-search-prefix' )
+                                               ->parse()
                                ) .
                                Xml::input(
                                        'prefix',
@@ -265,7 +266,7 @@ class SpecialUndelete extends SpecialPage {
                if ( $this->mSearchPrefix ) {
                        // For now, we enable search engine match only when specifically asked to
                        // by using fuzzy=1 parameter.
-                       if ( $this->getRequest()->getVal( "fuzzy", false ) ) {
+                       if ( $fuzzySearch ) {
                                $result = PageArchive::listPagesBySearch( $this->mSearchPrefix );
                        } else {
                                $result = PageArchive::listPagesByPrefix( $this->mSearchPrefix );
@@ -1100,9 +1101,11 @@ class SpecialUndelete extends SpecialPage {
                // Show revision undeletion warnings and errors
                $status = $archive->getRevisionStatus();
                if ( $status && !$status->isGood() ) {
-                       $out->wrapWikiMsg(
-                               "<div class=\"error\" id=\"mw-error-cannotundelete\">\n$1\n</div>",
-                               'cannotundelete'
+                       $out->addWikiText( '<div class="error" id="mw-error-cannotundelete">' .
+                               $status->getWikiText(
+                                       'cannotundelete',
+                                       'cannotundelete'
+                               ) . '</div>'
                        );
                }