From: Brion Vibber Date: Sun, 13 Aug 2006 23:42:38 +0000 (+0000) Subject: Revert part of 16036 using an undefined magic word, spews errors everywhere X-Git-Tag: 1.31.0-rc.0~55996 X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=ce9b1d9d08805969bf5e18327b41c1c076241b70;p=lhc%2Fweb%2Fwiklou.git Revert part of 16036 using an undefined magic word, spews errors everywhere --- diff --git a/includes/Parser.php b/includes/Parser.php index 604cb44767..ca08deb759 100644 --- a/includes/Parser.php +++ b/includes/Parser.php @@ -4086,11 +4086,9 @@ class Parser $mwWidth =& MagicWord::get( 'img_width' ); $mwCenter =& MagicWord::get( 'img_center' ); $mwFramed =& MagicWord::get( 'img_framed' ); - $mwPage =& MagicWord::get( 'img_page' ); $caption = ''; $width = $height = $framed = $thumb = false; - $page = null; $manual_thumb = '' ; foreach( $part as $key => $val ) { @@ -4100,9 +4098,6 @@ class Parser # use manually specified thumbnail $thumb=true; $manual_thumb = $match; - } elseif ( ! is_null( $match = $mwPage->matchVariableStartToEnd($val) ) ) { - # Select a page in a multipage document - $page = $match; } elseif ( ! is_null( $mwRight->matchVariableStartToEnd($val) ) ) { # remember to set an alignment, don't render immediately $align = 'right'; @@ -4141,8 +4136,7 @@ class Parser # Linker does the rest $sk =& $this->mOptions->getSkin(); - return $sk->makeImageLinkObj( $nt, $caption, $alt, $align, $width, $height, - $framed, $thumb, $manual_thumb, $page ); + return $sk->makeImageLinkObj( $nt, $caption, $alt, $align, $width, $height, $framed, $thumb, $manual_thumb ); } /**