X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FMagicWord.php;h=186821de394fd23458fe050c6589e6d94c95f037;hb=31ba08675466eb1dae5cad7294b527f135c6226d;hp=3e327c35593ead36ebf8299e1799bf81c486a93d;hpb=cdd964999370c7567b38565775d778721d7b39c0;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index 3e327c3559..186821de39 100644
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -96,6 +96,7 @@ class MagicWord {
 
 	static public $mVariableIDsInitialised = false;
 	static public $mVariableIDs = array(
+		'!',
 		'currentmonth',
 		'currentmonth1',
 		'currentmonthname',
@@ -171,7 +172,6 @@ class MagicWord {
 		'directionmark',
 		'contentlanguage',
 		'numberofadmins',
-		'numberofviews',
 		'cascadingsources',
 	);
 
@@ -214,7 +214,6 @@ class MagicWord {
 		'localtimestamp' => 3600,
 		'pagesinnamespace' => 3600,
 		'numberofadmins' => 3600,
-		'numberofviews' => 3600,
 		'numberingroup' => 3600,
 	);
 
@@ -274,7 +273,7 @@ class MagicWord {
 	static function getVariableIDs() {
 		if ( !self::$mVariableIDsInitialised ) {
 			# Get variable IDs
-			wfRunHooks( 'MagicWordwgVariableIDs', array( &self::$mVariableIDs ) );
+			Hooks::run( 'MagicWordwgVariableIDs', array( &self::$mVariableIDs ) );
 			self::$mVariableIDsInitialised = true;
 		}
 		return self::$mVariableIDs;
@@ -309,7 +308,7 @@ class MagicWord {
 	 */
 	static function getDoubleUnderscoreArray() {
 		if ( is_null( self::$mDoubleUnderscoreArray ) ) {
-			wfRunHooks( 'GetDoubleUnderscoreIDs', array( &self::$mDoubleUnderscoreIDs ) );
+			Hooks::run( 'GetDoubleUnderscoreIDs', array( &self::$mDoubleUnderscoreIDs ) );
 			self::$mDoubleUnderscoreArray = new MagicWordArray( self::$mDoubleUnderscoreIDs );
 		}
 		return self::$mDoubleUnderscoreArray;
@@ -331,15 +330,12 @@ class MagicWord {
 	 */
 	function load( $id ) {
 		global $wgContLang;
-		wfProfileIn( __METHOD__ );
 		$this->mId = $id;
 		$wgContLang->getMagic( $this );
 		if ( !$this->mSynonyms ) {
 			$this->mSynonyms = array( 'brionmademeputthishere' );
-			wfProfileOut( __METHOD__ );
 			throw new MWException( "Error: invalid magic word '$id'" );
 		}
-		wfProfileOut( __METHOD__ );
 	}
 
 	/**
@@ -656,7 +652,7 @@ class MagicWord {
 	 * This method uses the php feature to do several replacements at the same time,
 	 * thereby gaining some efficiency. The result is placed in the out variable
 	 * $result. The return value is true if something was replaced.
-	 * @todo Should this be static? It doesn't seem to be used at all
+	 * @deprecated since 1.25, unused
 	 *
 	 * @param array $magicarr
 	 * @param string $subject
@@ -665,6 +661,7 @@ class MagicWord {
 	 * @return bool
 	 */
 	function replaceMultiple( $magicarr, $subject, &$result ) {
+		wfDeprecated( __METHOD__, '1.25' );
 		$search = array();
 		$replace = array();
 		foreach ( $magicarr as $id => $replacement ) {
@@ -753,6 +750,7 @@ class MagicWordArray {
 
 	/**
 	 * Get a 2-d hashtable for this array
+	 * @return array
 	 */
 	function getHash() {
 		if ( is_null( $this->hash ) ) {
@@ -774,6 +772,7 @@ class MagicWordArray {
 
 	/**
 	 * Get the base regex
+	 * @return array
 	 */
 	function getBaseRegex() {
 		if ( is_null( $this->baseRegex ) ) {
@@ -798,6 +797,7 @@ class MagicWordArray {
 
 	/**
 	 * Get an unanchored regex that does not match parameters
+	 * @return array
 	 */
 	function getRegex() {
 		if ( is_null( $this->regex ) ) {