| Index: trunk/phase3/includes/Linker.php |
| — | — | @@ -1898,45 +1898,6 @@ |
| 1899 | 1899 | } |
| 1900 | 1900 | |
| 1901 | 1901 | /** |
| 1902 | | - * Creates the HTML source for images |
| 1903 | | - * @deprecated since 1.16 use makeImageLink2 |
| 1904 | | - * |
| 1905 | | - * @param $title Title object |
| 1906 | | - * @param $label String: label text |
| 1907 | | - * @param $alt String: alt text |
| 1908 | | - * @param $align String: horizontal alignment: none, left, center, right) |
| 1909 | | - * @param $handlerParams Array: parameters to be passed to the media handler |
| 1910 | | - * @param $framed Boolean: shows image in original size in a frame |
| 1911 | | - * @param $thumb Boolean: shows image as thumbnail in a frame |
| 1912 | | - * @param $manualthumb String: image name for the manual thumbnail |
| 1913 | | - * @param $valign String: vertical alignment: baseline, sub, super, top, text-top, middle, bottom, text-bottom |
| 1914 | | - * @param $time String: timestamp of the file, set as false for current |
| 1915 | | - * @return String |
| 1916 | | - */ |
| 1917 | | - static function makeImageLinkObj( $title, $label, $alt, $align = '', $handlerParams = array(), |
| 1918 | | - $framed = false, $thumb = false, $manualthumb = '', $valign = '', $time = false ) |
| 1919 | | - { |
| 1920 | | - $frameParams = array( 'alt' => $alt, 'caption' => $label ); |
| 1921 | | - if ( $align ) { |
| 1922 | | - $frameParams['align'] = $align; |
| 1923 | | - } |
| 1924 | | - if ( $framed ) { |
| 1925 | | - $frameParams['framed'] = true; |
| 1926 | | - } |
| 1927 | | - if ( $thumb ) { |
| 1928 | | - $frameParams['thumbnail'] = true; |
| 1929 | | - } |
| 1930 | | - if ( $manualthumb ) { |
| 1931 | | - $frameParams['manualthumb'] = $manualthumb; |
| 1932 | | - } |
| 1933 | | - if ( $valign ) { |
| 1934 | | - $frameParams['valign'] = $valign; |
| 1935 | | - } |
| 1936 | | - $file = wfFindFile( $title, array( 'time' => $time ) ); |
| 1937 | | - return self::makeImageLink2( $title, $file, $frameParams, $handlerParams, $time ); |
| 1938 | | - } |
| 1939 | | - |
| 1940 | | - /** |
| 1941 | 1902 | * Returns the attributes for the tooltip and access key. |
| 1942 | 1903 | */ |
| 1943 | 1904 | public static function tooltipAndAccesskeyAttribs( $name ) { |
| Index: trunk/extensions/FCKeditor/FCKeditorSkin.body.php |
| — | — | @@ -30,7 +30,7 @@ |
| 31 | 31 | |
| 32 | 32 | if( $found ) { |
| 33 | 33 | // trick to get real URL for image: |
| 34 | | - $originalLink = strip_tags( Linker::makeImageLinkObj( $nt, $label, $alt, $align, $params, $framed, $thumb, $manual_thumb, $valign ), '<img>' ); |
| | 34 | + $originalLink = strip_tags( Linker::makeImageLink2( $nt, $label, $alt, $align, $params, $framed, $thumb, $manual_thumb, $valign ), '<img>' ); |
| 35 | 35 | $srcPart = substr( $originalLink, strpos( $originalLink, "src=" ) + 5 ); |
| 36 | 36 | $url = strtok( $srcPart, '"' ); |
| 37 | 37 | } |