[MediaWiki-commits] [Gerrit] Escape text when calling image magik's covert - change (mediawiki...ZeroBanner)

2015-07-16 Thread Yurik (Code Review) 
Yurik has uploaded a new change for review.

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

Change subject: Escape text when calling image magik's covert
..

Escape text when calling image magik's covert

Change-Id: Ibb2b5532438a63feb1150919855a82dd96937373
---
M includes/ZeroSpecialPage.php
1 file changed, 8 insertions(+), 3 deletions(-)


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

diff --git a/includes/ZeroSpecialPage.php b/includes/ZeroSpecialPage.php
index d74ec07..1ddc43e 100644
--- a/includes/ZeroSpecialPage.php
+++ b/includes/ZeroSpecialPage.php
@@ -1,6 +1,7 @@
 ?php
 
 namespace ZeroBanner;
+use BitmapHandler;
 use Language;
 use SkinMinerva;
 use UnlistedSpecialPage;
@@ -86,10 +87,12 @@
}
 
public static function createImageBanner( $background, $foreground, 
$text, $isError = false ) {
-   global $wgZeroBannerFontSize, $wgZeroBannerImageSize, 
$wgZeroBannerErrImageSize, $wgZeroBannerFont;
+   global $wgImageMagickConvertCommand, $wgZeroBannerFontSize, 
$wgZeroBannerImageSize,
+  $wgZeroBannerErrImageSize, $wgZeroBannerFont;
+
// todo: Switch to pango: when it becomes available in a few 
months
$cmd = array(
-   'convert',
+   $wgImageMagickConvertCommand,
'+repage',
'-trim',
'-border', '3',
@@ -114,7 +117,9 @@
}
 
// These arguments must be after all other - ones
-   $cmd[] = ( $isError ? 'caption:' : 'label:' ) . $text;
+   // TODO: escapeMagickProperty should be made a static function
+   $handler = new BitmapHandler();
+   $cmd[] = ( $isError ? 'caption:' : 'label:' ) . 
$handler-escapeMagickProperty( $text );
$cmd[] = 'gif:-';
 
$output = wfShellExecWithStderr( $cmd, $retval );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb2b5532438a63feb1150919855a82dd96937373
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroBanner
Gerrit-Branch: master
Gerrit-Owner: Yurik yu...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Escape text when calling image magik's covert - change (mediawiki...ZeroBanner)

2015-07-16 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Escape text when calling image magik's covert
..


Escape text when calling image magik's covert

Change-Id: Ibb2b5532438a63feb1150919855a82dd96937373
---
M includes/ZeroSpecialPage.php
1 file changed, 8 insertions(+), 3 deletions(-)

Approvals:
  Yurik: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/ZeroSpecialPage.php b/includes/ZeroSpecialPage.php
index d74ec07..1ddc43e 100644
--- a/includes/ZeroSpecialPage.php
+++ b/includes/ZeroSpecialPage.php
@@ -1,6 +1,7 @@
 ?php
 
 namespace ZeroBanner;
+use BitmapHandler;
 use Language;
 use SkinMinerva;
 use UnlistedSpecialPage;
@@ -86,10 +87,12 @@
}
 
public static function createImageBanner( $background, $foreground, 
$text, $isError = false ) {
-   global $wgZeroBannerFontSize, $wgZeroBannerImageSize, 
$wgZeroBannerErrImageSize, $wgZeroBannerFont;
+   global $wgImageMagickConvertCommand, $wgZeroBannerFontSize, 
$wgZeroBannerImageSize,
+  $wgZeroBannerErrImageSize, $wgZeroBannerFont;
+
// todo: Switch to pango: when it becomes available in a few 
months
$cmd = array(
-   'convert',
+   $wgImageMagickConvertCommand,
'+repage',
'-trim',
'-border', '3',
@@ -114,7 +117,9 @@
}
 
// These arguments must be after all other - ones
-   $cmd[] = ( $isError ? 'caption:' : 'label:' ) . $text;
+   // TODO: escapeMagickProperty should be made a static function
+   $handler = new BitmapHandler();
+   $cmd[] = ( $isError ? 'caption:' : 'label:' ) . 
$handler-escapeMagickProperty( $text );
$cmd[] = 'gif:-';
 
$output = wfShellExecWithStderr( $cmd, $retval );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb2b5532438a63feb1150919855a82dd96937373
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroBanner
Gerrit-Branch: master
Gerrit-Owner: Yurik yu...@wikimedia.org
Gerrit-Reviewer: Yurik yu...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits