Index: /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.body.php
===================================================================
--- /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.body.php	(revision 505)
+++ /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.body.php	(revision 506)
@@ -355,8 +355,5 @@
     function replaceInternalLinks( $text ) {
         return parent::replaceInternalLinks($text);
-    }
-    function replaceExternalLinks( $text ) {
-        return parent::replaceExternalLinks($text);
-    }    
+    }	
     function formatHeadings( $text, $isMain=true ) {
     	return $text;
@@ -376,5 +373,17 @@
 {
     private $skin;
-        
+
+	function makeImageLinkObj( $nt, $label, $alt, $align = '', $params = array(), $framed = false,
+	  $thumb = false, $manual_thumb = '', $valign = '' )
+	{
+		global $wgContLang, $wgUser, $wgThumbLimits;
+		
+		$width = (isset($params['width'])) ? " width=\"{$params['width']}\"" : "";
+		$height = (isset($params['height'])) ? " height=\"{$params['height']}\"" : "";
+		$alt = (!is_null($alt) && strlen($alt)>0) ? "alt=\"$alt\"" : "";
+		
+		return "<img src=\"{$nt->getFullText()}\"{$width}{$height}{$alt} />";
+	}
+    
     function makeKnownLinkObj( $nt, $text = '', $query = '', $trail = '', $prefix = '' , $aprops = '', $style = '' )
     {
@@ -388,5 +397,5 @@
 
 		//$u = $nt->escapeLocalURL( $query );
-		$u = $nt->getText();
+		$u = $nt->getFullText();
 		
 		if ( $nt->getFragment() != '' ) {
@@ -421,6 +430,9 @@
 
 		//$u = $nt->escapeLocalURL( $query );
-		$u = $nt->getText();
-
+		//$u = $nt->getText();
+		//$u = $nt->getEscapedText();
+		$u = $nt->getFullText();
+		//print_r($nt);
+		
 		if ( '' == $text ) {
 			$text = htmlspecialchars( $nt->getPrefixedText() );
@@ -433,5 +445,16 @@
 		return $s;
     }    
-        
+    
+	function makeExternalLink( $url, $text, $escape = true, $linktype = '', $ns = null ) {		
+		$url = htmlspecialchars( $url );
+		if( $escape ) {
+			$text = htmlspecialchars( $text );
+		}
+		if ($linktype == 'autonumber') {
+		    return '<a href="'.$url.'">[autonumber]</a>';
+		}
+		return '<a href="'.$url.'">'.$text.'</a>';
+	}
+    
     function __call( $m, $a)
     {