Merge "Get GenderCache from MediaWikiServices"

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 32717f1..792b9bc 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1586,7 +1586,7 @@ $wgEnableUserEmail = true;
 
 /**
  * Set to true to put the sending user's email in a Reply-To header
- * instead of From. ($wgEmergencyContact will be used as From.)
+ * instead of From. ($wgPasswordSender will be used as From.)
  *
  * Some mailers (eg SMTP) set the SMTP envelope sender to the From value,
  * which can cause problems with SPF validation and leak recipient addresses

diff --git a/includes/MimeMagic.php b/includes/MimeMagic.php
index c03bce7..79218ab 100644 (file)
--- a/includes/MimeMagic.php
+++ b/includes/MimeMagic.php
@@ -27,7 +27,7 @@ class MimeMagic extends MimeAnalyzer {
         * @deprecated since 1.28
         */
        public static function singleton() {
-               return MediaWikiServices::getInstance()->getMIMEAnalyzer();
+               return MediaWikiServices::getInstance()->getMimeAnalyzer();
        }
 
        /**

diff --git a/package.json b/package.json
index 0e841f8..99e752c 100644 (file)
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "grunt-contrib-copy": "1.0.0",
     "grunt-contrib-watch": "1.0.0",
     "grunt-eslint": "19.0.0",
-    "grunt-jsonlint": "1.0.7",
+    "grunt-jsonlint": "1.1.0",
     "grunt-karma": "2.0.0",
     "grunt-stylelint": "0.6.0",
     "karma": "1.1.0",