From 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Dec 2013 09:55:49 +0100
Subject: Update to MediaWiki 1.22.0

---
 includes/MWFunction.php | 34 +++++-----------------------------
 1 file changed, 5 insertions(+), 29 deletions(-)

(limited to 'includes/MWFunction.php')

diff --git a/includes/MWFunction.php b/includes/MWFunction.php
index 36fcc30b..6d11d178 100644
--- a/includes/MWFunction.php
+++ b/includes/MWFunction.php
@@ -23,48 +23,24 @@
 class MWFunction {
 
 	/**
-	 * @param $callback
-	 * @return array
-	 * @throws MWException
-	 */
-	protected static function cleanCallback( $callback ) {
-		if( is_string( $callback ) ) {
-			if ( strpos( $callback, '::' ) !== false ) {
-				// PHP 5.1 cannot use call_user_func( 'Class::Method' )
-				// It can only handle only call_user_func( array( 'Class', 'Method' ) )
-				$callback = explode( '::', $callback, 2);
-			}
-		}
-
-		if( count( $callback ) == 2 && $callback[0] == 'self' || $callback[0] == 'parent' ) {
-			throw new MWException( 'MWFunction cannot call self::method() or parent::method()' );
-		}
-
-		// Run autoloader (workaround for call_user_func_array bug: http://bugs.php.net/bug.php?id=51329)
-		is_callable( $callback );
-
-		return $callback;
-	}
-
-	/**
+	 * @deprecated since 1.22; use call_user_func()
 	 * @param $callback
 	 * @return mixed
 	 */
 	public static function call( $callback ) {
-		$callback = self::cleanCallback( $callback );
-
+		wfDeprecated( __METHOD__, '1.22' );
 		$args = func_get_args();
-
 		return call_user_func_array( 'call_user_func', $args );
 	}
 
 	/**
+	 * @deprecated since 1.22; use call_user_func_array()
 	 * @param $callback
 	 * @param $argsarams
 	 * @return mixed
 	 */
 	public static function callArray( $callback, $argsarams ) {
-		$callback = self::cleanCallback( $callback );
+		wfDeprecated( __METHOD__, '1.22' );
 		return call_user_func_array( $callback, $argsarams );
 	}
 
@@ -74,7 +50,7 @@ class MWFunction {
 	 * @return object
 	 */
 	public static function newObj( $class, $args = array() ) {
-		if( !count( $args ) ) {
+		if ( !count( $args ) ) {
 			return new $class;
 		}
 
-- 
cgit v1.2.3-54-g00ecf