X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=includes%2FMagicWord.php;h=f5ac8890a0740fcea21c67994b1e86e3c4015aee;hb=c568220e610177114e71973375514d33871d6345;hp=5284e6211b258856d544d794784f73e1080c444d;hpb=258740c2df5b6b7fa123f692afe181cb821553e7;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index 5284e6211b..f5ac8890a0 100644
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -36,6 +36,7 @@ class MagicWord {
 	static public $mVariableIDsInitialised = false;
 	static public $mVariableIDs = array(
 		'currentmonth',
+		'currentmonth1',
 		'currentmonthname',
 		'currentmonthnamegen',
 		'currentmonthabbrev',
@@ -46,6 +47,7 @@ class MagicWord {
 		'currenttime',
 		'currenthour',
 		'localmonth',
+		'localmonth1',
 		'localmonthname',
 		'localmonthnamegen',
 		'localmonthabbrev',
@@ -62,6 +64,7 @@ class MagicWord {
 		'server',
 		'servername',
 		'scriptpath',
+		'stylepath',
 		'pagename',
 		'pagenamee',
 		'fullpagename',
@@ -78,9 +81,9 @@ class MagicWord {
 		'revisionmonth',
 		'revisionyear',
 		'revisiontimestamp',
+		'revisionuser',
 		'subpagename',
 		'subpagenamee',
-		'displaytitle',
 		'talkspace',
 		'talkspacee',
 		'subjectspace',
@@ -90,26 +93,23 @@ class MagicWord {
 		'subjectpagename',
 		'subjectpagenamee',
 		'numberofusers',
-		'newsectionlink',
+		'numberofactiveusers',
 		'numberofpages',
 		'currentversion',
 		'basepagename',
 		'basepagenamee',
-		'urlencode',
 		'currenttimestamp',
 		'localtimestamp',
 		'directionmark',
-		'language',
 		'contentlanguage',
-		'pagesinnamespace',
 		'numberofadmins',
-		'defaultsort',
-		'pagesincategory',
+		'numberofviews',
 	);
 
 	/* Array of caching hints for ParserCache */
 	static public $mCacheTTLs = array (
 		'currentmonth' => 86400,
+		'currentmonth1' => 86400,
 		'currentmonthname' => 86400,
 		'currentmonthnamegen' => 86400,
 		'currentmonthabbrev' => 86400,
@@ -120,6 +120,7 @@ class MagicWord {
 		'currenttime' => 3600,
 		'currenthour' => 3600,
 		'localmonth' => 86400,
+		'localmonth1' => 86400,
 		'localmonthname' => 86400,
 		'localmonthnamegen' => 86400,
 		'localmonthabbrev' => 86400,
@@ -137,12 +138,15 @@ class MagicWord {
 		'localweek' => 3600,
 		'localdow' => 3600,
 		'numberofusers' => 3600,
+		'numberofactiveusers' => 3600,
 		'numberofpages' => 3600,
 		'currentversion' => 86400,
 		'currenttimestamp' => 3600,
 		'localtimestamp' => 3600,
 		'pagesinnamespace' => 3600,
 		'numberofadmins' => 3600,
+		'numberofviews' => 3600,
+		'numberingroup' => 3600,
 		);
 
 	static public $mDoubleUnderscoreIDs = array(
@@ -152,7 +156,13 @@ class MagicWord {
 		'toc',
 		'noeditsection',
 		'newsectionlink',
+		'nonewsectionlink',
 		'hiddencat',
+		'index',
+		'noindex',
+		'staticredirect',
+		'notitleconvert',
+		'nocontentconvert',
 	);
 
 
@@ -178,7 +188,7 @@ class MagicWord {
 	 */
 	static function &get( $id ) {
 		wfProfileIn( __METHOD__ );
-		if (!array_key_exists( $id, self::$mObjects ) ) {
+		if ( !isset( self::$mObjects[$id] ) ) {
 			$mw = new MagicWord();
 			$mw->load( $id );
 			self::$mObjects[$id] = $mw;
@@ -223,6 +233,14 @@ class MagicWord {
 		return self::$mDoubleUnderscoreArray;
 	}
 
+	/**
+	 * Clear the self::$mObjects variable
+	 * For use in parser tests
+	 */
+	public static function clearCache() {
+		self::$mObjects = array();
+	}
+
 	# Initialises this object with an ID
 	function load( $id ) {
 		global $wgContLang;
@@ -302,16 +320,16 @@ class MagicWord {
 	}
 
 	/**
-	 * Returns true if the text contains the word
-	 * @return bool
+	 * Returns the number of times the text contains the word
+	 * @return int
 	 */
 	function match( $text ) {
 		return preg_match( $this->getRegex(), $text );
 	}
 
 	/**
-	 * Returns true if the text starts with the word
-	 * @return bool
+	 * Returns if the text starts with the word
+	 * @return int
 	 */
 	function matchStart( $text ) {
 		return preg_match( $this->getRegexStart(), $text );
@@ -327,7 +345,7 @@ class MagicWord {
 		$matches = array();
 		$matchcount = preg_match( $this->getVariableStartToEndRegex(), $text, $matches );
 		if ( $matchcount == 0 ) {
-			return NULL;
+			return null;
 		} else {
 			# multiple matched parts (variable match); some will be empty because of
 			# synonyms. The variable will be the second non-empty one so remove any