Merge "Avoid function calls in the loop condition of a for statement"

[lhc/web/wiklou.git] / includes / context / ContextSource.php

diff --git a/includes/context/ContextSource.php b/includes/context/ContextSource.php
index 4a3c2cb..076504e 100644 (file)
--- a/includes/context/ContextSource.php
+++ b/includes/context/ContextSource.php
@@ -34,9 +34,9 @@ abstract class ContextSource implements IContextSource {
        private $context;
 
        /**
-        * Get the RequestContext object
+        * Get the base IContextSource object
         * @since 1.18
-        * @return RequestContext
+        * @return IContextSource
         */
        public function getContext() {
                if ( $this->context === null ) {
@@ -134,18 +134,6 @@ abstract class ContextSource implements IContextSource {
                return $this->getContext()->getUser();
        }
 
-       /**
-        * Get the Language object
-        *
-        * @deprecated since 1.19 Use getLanguage instead
-        * @return Language
-        */
-       public function getLang() {
-               wfDeprecated( __METHOD__, '1.19' );
-
-               return $this->getLanguage();
-       }
-
        /**
         * Get the Language object
         *