Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

2 files changed, 1 insertions, 22 deletions

diff --git a/includes/config/ConfigException.php b/includes/config/ConfigException.php
index 75cd5eeb..3b3ba9de 100644
--- a/includes/config/ConfigException.php
+++ b/includes/config/ConfigException.php
@@ -25,5 +25,5 @@
  *
  * @since 1.23
  */
-class ConfigException extends MWException {
+class ConfigException extends Exception {
 }
diff --git a/includes/config/GlobalVarConfig.php b/includes/config/GlobalVarConfig.php
index 39d6e8e1..589f7d35 100644
--- a/includes/config/GlobalVarConfig.php
+++ b/includes/config/GlobalVarConfig.php
@@ -63,15 +63,6 @@ class GlobalVarConfig implements Config {
 	}
 
 	/**
-	 * @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.
 	 *
 	 * @param string $prefix Prefix to use on the variable, if one.
@@ -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;
-	}
 }