Merge "Add attributes parameter to ShowSearchHitTitle"

[lhc/web/wiklou.git] / includes / config / GlobalVarConfig.php

diff --git a/includes/config/GlobalVarConfig.php b/includes/config/GlobalVarConfig.php
index 39d6e8e..6295371 100644 (file)
--- a/includes/config/GlobalVarConfig.php
+++ b/includes/config/GlobalVarConfig.php
@@ -46,7 +46,7 @@ class GlobalVarConfig implements Config {
        }
 
        /**
-        * @see Config::get
+        * @inheritDoc
         */
        public function get( $name ) {
                if ( !$this->has( $name ) ) {
@@ -56,21 +56,12 @@ class GlobalVarConfig implements Config {
        }
 
        /**
-        * @see Config::has
+        * @inheritDoc
         */
        public function has( $name ) {
                return $this->hasWithPrefix( $this->prefix, $name );
        }
 
-       /**
-        * @see MutableConfig::set
-        * @deprecated since 1.24
-        */
-       public function set( $name, $value ) {
-               wfDeprecated( __METHOD__, '1.24' );
-               $this->setWithPrefix( $this->prefix, $name, $value );
-       }
-
        /**
         * Get a variable with a given prefix, if not the defaults.
         *
@@ -93,16 +84,4 @@ class GlobalVarConfig implements Config {
                $var = $prefix . $name;
                return array_key_exists( $var, $GLOBALS );
        }
-
-       /**
-        * Get a variable with a given prefix, if not the defaults.
-        *
-        * @param string $prefix Prefix to use on the variable
-        * @param string $name Variable name without prefix
-        * @param mixed $value Value to set
-        * @deprecated since 1.24
-        */
-       protected function setWithPrefix( $prefix, $name, $value ) {
-               $GLOBALS[$prefix . $name] = $value;
-       }
 }