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

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index 7d2b8f5..cf9ffa0 100644 (file)
--- 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 d33ece0..8c50a4f 100644 (file)
--- 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 84be38c..ee3b63e 100644 (file)
--- 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:'              ),
 );
 
 #-------------------------------------------------------------------