From d1f3210762ba7fdaabb550429aba8875748ab13b Mon Sep 17 00:00:00 2001 From: Jens Frank Date: Mon, 16 Feb 2004 21:44:15 +0000 Subject: [PATCH] added |center| parameter to extended image syntax. Not using CSS to center due to incompatibilities with existing browsers --- includes/Skin.php | 25 ++++++++++++++++++------- languages/Language.php | 4 +++- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/includes/Skin.php b/includes/Skin.php index 9d8c199572..1157eed06c 100644 --- a/includes/Skin.php +++ b/includes/Skin.php @@ -1435,6 +1435,7 @@ class Skin { $name = $nt->getDBKey(); $url = wfImageUrl( $name ); $align = ""; + $prefix = $postfix = ""; if ( $wgUseImageResize ) { # Check if the alt text is of the form "options|alt text" @@ -1447,11 +1448,12 @@ class Skin { $part = explode( "|", $alt); - $mwThumb =& MagicWord::get( MAG_IMG_THUMBNAIL ); - $mwLeft =& MagicWord::get( MAG_IMG_LEFT ); - $mwRight =& MagicWord::get( MAG_IMG_RIGHT ); - $mwNone =& MagicWord::get( MAG_IMG_NONE ); - $mwWidth =& MagicWord::get( MAG_IMG_WIDTH ); + $mwThumb =& MagicWord::get( MAG_IMG_THUMBNAIL ); + $mwLeft =& MagicWord::get( MAG_IMG_LEFT ); + $mwRight =& MagicWord::get( MAG_IMG_RIGHT ); + $mwNone =& MagicWord::get( MAG_IMG_NONE ); + $mwWidth =& MagicWord::get( MAG_IMG_WIDTH ); + $mwCenter =& MagicWord::get( MAG_IMG_CENTER ); $alt = $part[count($part)-1]; $thumb=false; @@ -1465,6 +1467,9 @@ class Skin { } elseif ( ! is_null( $mwLeft->matchVariableStartToEnd($val) ) ) { # remember to set an alignment, don't render immediately $align = "left"; + } elseif ( ! is_null( $mwCenter->matchVariableStartToEnd($val) ) ) { + # remember to set an alignment, don't render immediately + $align = "center"; } elseif ( ! is_null( $mwNone->matchVariableStartToEnd($val) ) ) { # remember to set an alignment, don't render immediately $align = "none"; @@ -1473,6 +1478,12 @@ class Skin { $width = intval($match); } } + if ( "center" == $align ) + { + $prefix = "
"; + $postfix = "
"; + $align = "none"; + } if ( $thumb ) { @@ -1489,7 +1500,7 @@ class Skin { if ( ! isset($width) ) { $width = 180; } - return $this->makeThumbLinkObj( $nt, $alt, $align, $width ); + return $prefix.$this->makeThumbLinkObj( $nt, $alt, $align, $width ).$postfix; } elseif ( isset($width) ) { @@ -1510,7 +1521,7 @@ class Skin { if ( "" != $align ) { $s = "
{$s}
"; } - return $s; + return $prefix.$s.$postfix; } function createThumb( $name, $width ) { diff --git a/languages/Language.php b/languages/Language.php index 9624328391..a8630f5020 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -25,6 +25,7 @@ define("MAG_IMG_RIGHT", 17); define("MAG_IMG_LEFT", 18); define("MAG_IMG_NONE", 19); define("MAG_IMG_WIDTH", 20); +define("MAG_IMG_CENTER", 21); #-------------------------------------------------------------------------- @@ -313,7 +314,8 @@ this (alternative: like this?).", MAG_IMG_RIGHT => array( 1, "right" ), MAG_IMG_LEFT => array( 1, "left" ), MAG_IMG_NONE => array( 1, "none" ), - MAG_IMG_WIDTH => array( 1, "$1px" ) + MAG_IMG_WIDTH => array( 1, "$1px" ), + MAG_IMG_CENTER => array( 1, "center", "centre" ) ); -- 2.20.1