http://www.mediawiki.org/wiki/Special:Code/MediaWiki/90579

Revision: 90579
Author:   reedy
Date:     2011-06-22 11:52:11 +0000 (Wed, 22 Jun 2011)
Log Message:
-----------
Followup r87600, fix method call in FCKEditor

Modified Paths:
--------------
    trunk/extensions/FCKeditor/FCKeditorSkin.body.php

Modified: trunk/extensions/FCKeditor/FCKeditorSkin.body.php
===================================================================
--- trunk/extensions/FCKeditor/FCKeditorSkin.body.php   2011-06-22 11:48:24 UTC 
(rev 90578)
+++ trunk/extensions/FCKeditor/FCKeditorSkin.body.php   2011-06-22 11:52:11 UTC 
(rev 90579)
@@ -21,7 +21,6 @@
        $thumb = false, $manual_thumb = '', $valign = '' ) {
                $orginal = $nt->getText();
                $img = wfFindFile( $nt );
-               $imgName = $img->getName();
                $found = $img->getURL();
 
                if( !is_null( $alt ) && ( $alt == 'RTENOTITLE' ) ) { // 2223
@@ -30,7 +29,17 @@
 
                if( $found ) {
                        // trick to get real URL for image:
-                       $originalLink = strip_tags( Linker::makeImageLink2( 
$nt, $label, $alt, $align, $params, $framed, $thumb, $manual_thumb, $valign ), 
'<img>' );
+                       $frameParams = array(
+                               'alt' => $alt,
+                               'caption' => $label,
+                               'align' => $align,
+                               'framed' => $framed,
+                               'thumbnail' => $thumb,
+                               'manualthumb' => $manual_thumb,
+                               'valign' => $valign
+                       );
+
+                       $originalLink = strip_tags( Linker::makeImageLink2( 
$nt, $img, $frameParams, $params ), '<img>' );
                        $srcPart = substr( $originalLink, strpos( 
$originalLink, "src=" ) + 5 );
                        $url = strtok( $srcPart, '"' );
                }


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to