Ticket #5214: FCK_img_link_fix.patch

FCKeditorSkin.body.php

@@ -158 +158 @@
                 if( $fp['align'] ) {
                         $ret .= "_fck_mw_location=\"" . strtolower( $fp['align'] ) . "\" ";
                 }
+                if( $fp['link-url'] ) {
+                        $ret .= "_fck_link_url=\"" . $fp['link-url'] . "\" ";
+                }
+                if( $fp['link-title'] ) {
+                        $ret .= "_fck_link_title=\"" . $fp['link-title'] . "\" ";
+                }
                 if( !empty( $hp ) ) {
                         if( isset( $hp['width'] ) ) {
                                 $ret .= "_fck_mw_width=\"" . $hp['width'] . "\" ";

plugins/mediawiki/fckplugin.js

@@ -553 +553 @@
                                                         var imgStyleHeight      = ( parseInt(htmlNode.style.height) || '' ) + '';
                                                         var imgRealWidth        = ( htmlNode.getAttribute( 'width' ) || '' ) + '';
                                                         var imgRealHeight       = ( htmlNode.getAttribute( 'height' ) || '' ) + '';
+                                                        var imgLinkUrl          = htmlNode.getAttribute( '_fck_link_url' ) || '';
+                                                        var imgLinkTitle        = htmlNode.getAttribute( '_fck_link_title' ) || '';
 
                                                         stringBuilder.push( '[[Image:' );
                                                         stringBuilder.push( imgName );
@@ -582 +584 @@
                                                                 stringBuilder.push( 'px' );
                                                         }
                                                         
+                                                        if ( imgLinkUrl.length > 0 ){
+                                                                stringBuilder.push( '|link=' + imgLinkUrl );
+                                                                imgCaption = '';
+                                                        }
+                                                        else if ( imgLinkTitle.length > 0 ){
+                                                                stringBuilder.push( '|link=' + imgLinkTitle );
+                                                                imgCaption = '';
+                                                        }
                                                         if ( imgCaption.length > 0 )
                                                                 stringBuilder.push( '|' + imgCaption );