* Remove last remaining traces of wfLoadExtensionMessages().

* Add missing action message and remove unused global in UploadLocal.
* Some whitespace updates in Maps.

diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20
index d52f4c0..b574e0c 100644 (file)
--- a/RELEASE-NOTES-1.20
+++ b/RELEASE-NOTES-1.20
@@ -15,6 +15,7 @@ production.
 === New features in 1.20 ===
 * Added TitleIsKnown hook which gets called when determining if a page exists.
 * (bug 32341) Add upload by URL domain limitation.
+* wfLoadExtensionMessages() was removed. Deprecated in 1.16, removed in 1.20.
 
 === Bug fixes in 1.20 ===
 * (bug 30245) Use the correct way to construct a log page title.

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index dca4e14..3af80ad 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -3566,16 +3566,6 @@ function wfBoolToStr( $value ) {
        return $value ? 'true' : 'false';
 }
 
-/**
- * Load an extension messages file
- *
- * @deprecated since 1.16, warnings in 1.18, remove in 1.20
- * @codeCoverageIgnore
- */
-function wfLoadExtensionMessages() {
-       wfDeprecated( __FUNCTION__, '1.16' );
-}
-
 /**
  * Get a platform-independent path to the null file, e.g. /dev/null
  *

diff --git a/includes/PageQueryPage.php b/includes/PageQueryPage.php
index dc5e971..40213d1 100644 (file)
--- a/includes/PageQueryPage.php
+++ b/includes/PageQueryPage.php
@@ -6,7 +6,6 @@
  * @ingroup SpecialPage
  */
 abstract class PageQueryPage extends QueryPage {
-
        /**
         * Format the result as a simple link to the page
         *
@@ -16,11 +15,14 @@ abstract class PageQueryPage extends QueryPage {
         */
        public function formatResult( $skin, $row ) {
                global $wgContLang;
+
                $title = Title::makeTitleSafe( $row->namespace, $row->title );
                $text = $row->title;
+
                if ( $title instanceof Title ) {
                        $text = $wgContLang->convert( $title->getPrefixedText() );
                }
+
                return Linker::linkKnown( $title, htmlspecialchars( $text ) );
        }
 }