From: Tim Starling <tstarling@users.mediawiki.org>
Date: Fri, 23 Sep 2005 12:10:39 +0000 (+0000)
Subject: added {{fullurl:}} and {{fullurle:}} functions
X-Git-Tag: 1.6.0~1588
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=18657a50e4efd9f9178d9fce209e02c4de0d3c60;p=lhc%2Fweb%2Fwiklou.git

added {{fullurl:}} and {{fullurle:}} functions
---

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index 7d2b8f5646..cf9ffa06ee 100644
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -57,6 +57,8 @@ define('MAG_SERVERNAME',		42);
 define('MAG_NUMBEROFFILES',		43);
 define('MAG_IMG_MANUALTHUMB',		44);
 define('MAG_PLURAL',			45);
+define('MAG_FULLURL',			46);
+define('MAG_FULLURLE',			47);
 
 $wgVariableIDs = array(
 	MAG_CURRENTMONTH,
diff --git a/includes/Parser.php b/includes/Parser.php
index d33ece0ffe..8c50a4f251 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -2139,20 +2139,27 @@ class Parser
 			}
 		}
 
-		# LOCALURL and LOCALURLE
+		# LOCALURL and FULLURL
 		if ( !$found ) {
-			$mwLocal = MagicWord::get( MAG_LOCALURL );
-			$mwLocalE = MagicWord::get( MAG_LOCALURLE );
+			$mwLocal =& MagicWord::get( MAG_LOCALURL );
+			$mwLocalE =& MagicWord::get( MAG_LOCALURLE );
+			$mwFull =& MagicWord::get( MAG_FULLURL );
+			$mwFullE =& MagicWord::get( MAG_FULLURLE );
+			
 
 			if ( $mwLocal->matchStartAndRemove( $part1 ) ) {
 				$func = 'getLocalURL';
 			} elseif ( $mwLocalE->matchStartAndRemove( $part1 ) ) {
 				$func = 'escapeLocalURL';
+			} elseif ( $mwFull->matchStartAndRemove( $part1 ) ) {
+				$func = 'getFullURL';
+			} elseif ( $mwFullE->matchStartAndRemove( $part1 ) ) {
+				$func = 'escapeFullURL';
 			} else {
-				$func = '';
+				$func = false;
 			}
 
-			if ( $func !== '' ) {
+			if ( $func !== false ) {
 				$title = Title::newFromText( $part1 );
 				if ( !is_null( $title ) ) {
 					if ( $argc > 0 ) {
diff --git a/languages/Language.php b/languages/Language.php
index 84be38c2a7..ee3b63e637 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -234,6 +234,8 @@ $wgLanguageNamesEn =& $wgLanguageNames;
 	MAG_CURRENTDOW           => array( 1,    'CURRENTDOW'             ),
 	MAG_REVISIONID           => array( 1,    'REVISIONID'             ),
 	MAG_PLURAL               => array( 0,    'PLURAL:'                ),
+	MAG_FULLURL              => array( 0,    'FULLURL:'               ),
+	MAG_FULLURLE             => array( 0,    'FULLURLE:'              ),
 );
 
 #-------------------------------------------------------------------