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

Revision: 90578
Author:   reedy
Date:     2011-06-22 11:48:24 +0000 (Wed, 22 Jun 2011)
Log Message:
-----------
Kill deprecated unused 1.11 code

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

Modified: trunk/extensions/FCKeditor/FCKeditorSkin.body.php
===================================================================
--- trunk/extensions/FCKeditor/FCKeditorSkin.body.php   2011-06-22 08:38:37 UTC 
(rev 90577)
+++ trunk/extensions/FCKeditor/FCKeditorSkin.body.php   2011-06-22 11:48:24 UTC 
(rev 90578)
@@ -93,120 +93,6 @@
                return $ret;
        }
 
-       /**
-        * Make an image link in MediaWiki 1.11
-        * @param Title $title Title object
-        * @param File $file File object, or false if it doesn't exist
-        *
-        * @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
-        *     will often be false.
-        *          thumbnail       If present, downscale and frame
-        *          manualthumb     Image name to use as a thumbnail, instead 
of automatic scaling
-        *          framed          Shows image in original size in a frame
-        *          frameless       Downscale but don't frame
-        *          upright         If present, tweak default sizes for 
portrait orientation
-        *          upright_factor  Fudge factor for "upright" tweak (default 
0.75)
-        *          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,
-        *                          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".
-        */
-       function makeImageLink2( Title $nt, $file, $frameParams = array(), 
$handlerParams = array() ) {
-               $orginal = $nt->getText();
-               $img = wfFindFile( $nt );
-               $imgName = $img->getName();
-               $found = $img->getURL();
-
-               if( !empty( $frameParams['alt'] ) && $frameParams['alt'] == 
'RTENOTITLE' ){ // 2223
-                       $frameParams['alt'] = '';
-               }
-               if( $found ) {
-                       $linker = new Linker();
-                       $originalLink = $linker->makeImageLink2( $nt, $file, 
$frameParams, $handlerParams );
-
-                       if( false !== strpos( $originalLink, "src=\"" ) ) {
-                               $srcPart = substr( $originalLink, strpos( 
$originalLink, "src=" ) + 5 );
-                               $url = strtok( $srcPart, '"' );
-                       }
-                       $srcPart = substr( $originalLink, strpos( 
$originalLink, "src=" ) + 5 );
-                       $url = strtok( $srcPart, '"' );
-               }
-
-               // Shortcuts
-               $fp =& $frameParams;
-               $hp =& $handlerParams;
-
-               if( !isset( $fp['align'] ) ) {
-                       $fp['align'] = '';
-               }
-
-               $ret = '<img ';
-
-               if( $found ) {
-                       $ret .= "src=\"{$url}\" ";
-               } else {
-                       $ret .= "_fck_mw_valid=\"false"."\" ";
-               }
-               $ret .= "_fck_mw_filename=\"{$orginal}\" ";
-
-               if( $fp['align'] ) {
-                       $ret .= "_fck_mw_location=\"" . strtolower( 
$fp['align'] ) . "\" ";
-               }
-               if( !empty( $hp ) ) {
-                       if( isset( $hp['width'] ) ) {
-                               $ret .= "_fck_mw_width=\"" . $hp['width'] . "\" 
";
-                       }
-                       if( isset( $hp['height'] ) ) {
-                               $ret .= "_fck_mw_height=\"" . $hp['height'] . 
"\" ";
-                       }
-               }
-               $class = '';
-               if( isset( $fp['thumbnail'] ) ) {
-                       $ret .= "_fck_mw_type=\"thumb" . "\" ";
-                       $class .= 'fck_mw_frame';
-               } elseif( isset( $fp['border'] ) ) {
-                       $ret .= "_fck_mw_type=\"border" . "\" ";
-                       $class .= 'fck_mw_border';
-               } elseif( isset( $fp['framed'] ) ) {
-                       $ret .= "_fck_mw_type=\"frame" . "\" ";
-                       $class .= 'fck_mw_frame';
-               }
-
-               if( $fp['align'] == 'right' ) {
-                       $class .= ( $class ? ' ': '' ) . 'fck_mw_right';
-               } elseif( $fp['align'] == 'center' ) {
-                       $class .= ( $class ? ' ' : ''  ) . 'fck_mw_center';
-               } elseif( $fp['align'] == 'left' ) {
-                       $class .= ( $class ? ' ': '' ) . 'fck_mw_left';
-               } elseif( isset( $fp['framed'] ) || isset( $fp['thumbnail'] ) ) 
{
-                       $class .= ( $class ? ' ' : '' ) . 'fck_mw_right';
-               }
-
-               if( !$found ) {
-                       $class .= ( $class ? ' ' : '' ) . 'fck_mw_notfound';
-               }
-
-               if( isset( $fp['alt'] ) && !empty( $fp['alt'] ) && $fp['alt'] 
!= 'Image:' . $orginal ) {
-                       $ret .= "alt=\"" . htmlspecialchars( $fp['alt'] ) . "\" 
";
-               } else {
-                       $ret .= "alt=\"\" ";
-               }
-
-               if( $class ) {
-                       $ret .= "class=\"$class\" ";
-               }
-
-               $ret .= '/>';
-
-               return $ret;
-       }
-
        function makeLinkObj( $nt, $text= '', $query = '', $trail = '', $prefix 
= '' ) {
                wfProfileIn( __METHOD__ );
                if ( $nt->isExternal() ) {


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

Reply via email to