From: Matthias Schmidt <gravatronics@live.com>
Date: Sun, 27 Nov 2016 15:25:03 +0000 (+0100)
Subject: Merge branch '2.1'
X-Git-Tag: 3.0.0_RC_1~117
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=11c91f177cd7dd561692aae6b26b9323ab7822f2;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.1'
---

11c91f177cd7dd561692aae6b26b9323ab7822f2
diff --cc wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php
index ba78d0f61e,6994d6ebe1..51b5580290
--- a/wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php
+++ b/wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php
@@@ -183,12 -185,12 +183,12 @@@ class ImagickImageAdapter implements II
  	}
  	
  	/**
 -	 * @see	\wcf\system\image\adapter\IImageAdapter::drawText()
 +	 * @inheritDoc
  	 */
 -	public function drawText($text, $x, $y, $font, $size, $opacity = 1) {
 +	public function drawText($text, $x, $y, $font, $size, $opacity = 1.0) {
  		$draw = new \ImagickDraw();
- 		$draw->setFillOpacity($opacity);
  		$draw->setFillColor($this->color);
+ 		$draw->setFillOpacity($opacity);
  		$draw->setTextAntialias(true);
  		$draw->setFont($font);
  		$draw->setFontSize($size);