* (bug 9628) Show warnings about slave lag on Special:Contributions,
Special:Watchlist
* (bug 8818) Expose "wpDestFile" as parameter $1 to "uploaddisabledtext"
-* Introducing new image keyword 'upright' and corresponding variable
+* Introducing new image parameter 'upright' and corresponding variable
$wgThumbUpright. This allows better proportional view of upright images
related to landscape images on a page without nailing the width of upright
images to a fix value which makes views for anon unproportional and user
preferences useless
-* (bug 6072) Introducing 'border' keyword to the [[Image:]] syntax
-* Introducing 'frameless' keyword to [[Image:]] syntax which respects the
- user preferences for image width like 'thumb' but without a frame.
-
+* (bug 6072) Add a 'border' keyword to the image syntax
+
== Bugfixes since 1.10 ==
* (bug 9712) Use Arabic comma in date/time formats for Arabic and Farsi
/** @todo document */
function makeImageLinkObj( $nt, $label, $alt, $align = '', $params = array(), $framed = false,
- $thumb = false, $manual_thumb = '', $valign = '', $upright = false, $upright_factor = 0, $border = false, $frameless = false )
+ $thumb = false, $manual_thumb = '', $valign = '', $upright = false, $upright_factor = 0, $border = false )
{
global $wgContLang, $wgUser, $wgThumbLimits, $wgThumbUpright;
if ( !isset( $params['width'] ) ) {
$params['width'] = $img->getWidth( $page );
- if( $thumb || $framed || $frameless ) {
+ if( $thumb || $framed ) {
$wopt = $wgUser->getOption( 'thumbsize' );
if( !isset( $wgThumbLimits[$wopt] ) ) {
# * ___px scale to ___ pixels width, no aligning. e.g. use in taxobox
# * center center the image
# * framed Keep original image size, no magnify-button.
- # * frameless like 'thumbnail' but without frame, enlarge-icon and caption. User preference thumb width is used
# * upright reduce width for upright images, rounded to full __0 px
# * border draw a 1px border around the image
# vertical-align values (no % or length right now):
$mwManualThumb =& MagicWord::get( 'img_manualthumb' );
$mwWidth =& MagicWord::get( 'img_width' );
$mwFramed =& MagicWord::get( 'img_framed' );
- $mwFrameless =& MagicWord::get( 'img_frameless' );
$mwUpright =& MagicWord::get( 'img_upright' );
$mwBorder =& MagicWord::get( 'img_border' );
$mwPage =& MagicWord::get( 'img_page' );
$params = array();
$framed = $thumb = false;
- $frameless = false;
$upright = false;
$upright_factor = 0;
$border = false;
$upright_factor = floatval( $match );
} elseif ( !is_null( $mwBorder->matchVariableStartToEnd( $val ) ) ) {
$border = true;
- } elseif ( !is_null( $mwFrameless->matchVariableStartToEnd( $val ) ) ) {
- $frameless = true;
} elseif ( ! is_null( $match = $mwManualThumb->matchVariableStartToEnd($val) ) ) {
# use manually specified thumbnail
$thumb=true;
$alt = Sanitizer::stripAllTags( $alt );
# Linker does the rest
- return $sk->makeImageLinkObj( $nt, $caption, $alt, $align, $params, $framed, $thumb, $manual_thumb, $valign, $upright, $upright_factor, $border, $frameless );
+ return $sk->makeImageLinkObj( $nt, $caption, $alt, $align, $params, $framed, $thumb, $manual_thumb, $valign, $upright, $upright_factor, $border );
}
/**
'img_width' => array( 1, '$1px' ),
'img_center' => array( 1, 'center', 'centre' ),
'img_framed' => array( 1, 'framed', 'enframed', 'frame' ),
- 'img_frameless' => array( 1, 'frameless' ),
'img_page' => array( 1, 'page=$1', 'page $1' ),
'img_upright' => array( 1, 'upright', 'upright=$1', 'upright $1' ),
'img_border' => array( 1, 'border' ),