From: Martin Jansen <mj@php.net>
Date: Sat, 11 Dec 2010 20:10:39 +0000 (+0000)
Subject: Merge from trunk:
X-Git-Tag: php-5.3.6RC1~247
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f6cedd2ad53da2020fd6bfe2ff9346e54986abf4;p=php

Merge from trunk:

* Fixed parameter check introduced with the recent fix for bug #53492.

* Improved the error message along the way.
---

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 85fb3361a8..21342edd85 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -4228,8 +4228,8 @@ PHP_FUNCTION(imagepstext)
 		return;
 	}
 
-	if (aa_steps != 4 || aa_steps != 16) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "AA steps must be 4 or 16");
+	if (aa_steps != 4 && aa_steps != 16) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Antialias steps must be 4 or 16");
 		RETURN_FALSE;
 	}