Merge "Simplify HTMLTitleTextField::validate"

[lhc/web/wiklou.git] / includes / cache / LinkBatch.php

diff --git a/includes/cache/LinkBatch.php b/includes/cache/LinkBatch.php
index c1aef59..7a0826e 100644 (file)
--- a/includes/cache/LinkBatch.php
+++ b/includes/cache/LinkBatch.php
@@ -57,9 +57,12 @@ class LinkBatch {
         * @since 1.17
         *
         * @param string $caller
+        * @return self (since 1.32)
         */
        public function setCaller( $caller ) {
                $this->caller = $caller;
+
+               return $this;
        }
 
        /**
@@ -221,12 +224,13 @@ class LinkBatch {
                if ( $this->isEmpty() ) {
                        return false;
                }
+               $services = MediaWikiServices::getInstance();
 
-               if ( !MediaWikiServices::getInstance()->getContentLanguage()->needsGenderDistinction() ) {
+               if ( !$services->getContentLanguage()->needsGenderDistinction() ) {
                        return false;
                }
 
-               $genderCache = MediaWikiServices::getInstance()->getGenderCache();
+               $genderCache = $services->getGenderCache();
                $genderCache->doLinkBatch( $this->data, $this->caller );
 
                return true;