Dr0ptp4kt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/180489

Change subject: Fix missing GIF banner size
......................................................................

Fix missing GIF banner size

Currently, the  -size command line paramter to ImageMagick
does not appear to be getting added for ineligible zerodot
GIF banners. This patch tries to correct this.

Change-Id: I622a041607f3dcf82a354aa0c61e906ebbab2e85
---
M includes/ZeroSpecialPage.php
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroBanner 
refs/changes/89/180489/1

diff --git a/includes/ZeroSpecialPage.php b/includes/ZeroSpecialPage.php
index 6310e0a..14384c9 100644
--- a/includes/ZeroSpecialPage.php
+++ b/includes/ZeroSpecialPage.php
@@ -95,8 +95,11 @@
                       ' -background ' . wfEscapeShellArg( $background ) .
                       ' -fill ' . wfEscapeShellArg( $foreground ) .
                       ( $wgZeroBannerFont ? ' -font ' . wfEscapeShellArg( 
$wgZeroBannerFont ) : '' ) .
-                      ( $wgZeroBannerFontSize ? ( ' -pointsize ' . 
wfEscapeShellArg( $wgZeroBannerFontSize ) ) :
-                              ( ' -size ' . wfEscapeShellArg( $isError ? 
$wgZeroBannerErrImageSize : $wgZeroBannerImageSize ) ) ) .
+                      ( $wgZeroBannerFontSize ? ' -pointsize ' . 
wfEscapeShellArg( $wgZeroBannerFontSize ) : '' ) .
+                          ( $wgZeroBannerErrImageSize && 
$wgZeroBannerImageSize ?
+                                  ' -size ' . wfEscapeShellArg( $isError ? 
$wgZeroBannerErrImageSize : $wgZeroBannerImageSize ) :
+                                  ''
+                          ) .
                       // These arguments must be after all other "-xxxx" ones
                       ' ' . wfEscapeShellArg( ( $isError ? 'caption:' : 
'label:' ) . $text ) .
                       ' gif:-';

-- 
To view, visit https://gerrit.wikimedia.org/r/180489
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I622a041607f3dcf82a354aa0c61e906ebbab2e85
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroBanner
Gerrit-Branch: master
Gerrit-Owner: Dr0ptp4kt <[email protected]>

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

Reply via email to