Index: /MediaWiki/trunk/FCKeditorSkin.body.php
===================================================================
--- /MediaWiki/trunk/FCKeditorSkin.body.php	(revision 3177)
+++ /MediaWiki/trunk/FCKeditorSkin.body.php	(revision 3178)
@@ -16,5 +16,5 @@
 	 * @param string $manual_thumb image name for the manual thumbnail
 	 * @param string $valign vertical alignment: baseline, sub, super, top, text-top, middle, bottom, text-bottom
-	 * @return string     * 
+	 * @return string     *
 	 */
 	function makeImageLinkObj( $nt, $label, $alt, $align = '', $params = array(), $framed = false,
@@ -106,5 +106,5 @@
 	 *
 	 * @param array $frameParams Associative array of parameters external to the media handler.
-	 *     Boolean parameters are indicated by presence or absence, the value is arbitrary and 
+	 *     Boolean parameters are indicated by presence or absence, the value is arbitrary and
 	 *     will often be false.
 	 *          thumbnail       If present, downscale and frame
@@ -116,11 +116,11 @@
 	 *          border          If present, show a border around the image
 	 *          align           Horizontal alignment (left, right, center, none)
-	 *          valign          Vertical alignment (baseline, sub, super, top, text-top, middle, 
+	 *          valign          Vertical alignment (baseline, sub, super, top, text-top, middle,
 	 *                          bottom, text-bottom)
 	 *          alt             Alternate text for image (i.e. alt attribute). Plain text.
 	 *          caption         HTML for image caption.
 	 *
-	 * @param array $handlerParams Associative array of media handler parameters, to be passed 
-	 *       to transform(). Typical keys are "width" and "page". 
+	 * @param array $handlerParams Associative array of media handler parameters, to be passed
+	 *       to transform(). Typical keys are "width" and "page".
 	 */
 	function makeImageLink2( Title $nt, $file, $frameParams = array(), $handlerParams = array() ) {
@@ -130,5 +130,5 @@
 		$found = $img->getURL();
 
-		if( $frameParams['alt'] == 'RTENOTITLE' ){	//2223
+		if (!empty($frameParams['alt']) && $frameParams['alt'] == 'RTENOTITLE' ){	//2223
 			$frameParams['alt'] = '';
 		}
@@ -220,5 +220,5 @@
 		return $ret;
 	}
-	
+
 	function makeLinkObj( $nt, $text= '', $query = '', $trail = '', $prefix = '' ) {
 		global $wgUser;
@@ -249,7 +249,7 @@
 			return $t;
 		}
-		
+
 		return Linker::makeLinkObj($nt, $text, $query, $trail, $prefix);
-	
+
 	}
 	function makeKnownLinkObj( $nt, $text = '', $query = '', $trail = '', $prefix = '' , $aprops = '', $style = '' ) {
@@ -275,5 +275,5 @@
 				}
 			}
-			
+
 			/*
 			* See tickets 1386 and 1690 before changing anything