Merge from trunk:

* Fixed parameter check introduced with the recent fix for bug #53492. * Improved the error message along the way.
php · Dec 11, 2010 · cedbc50 · cedbc50
1 parent 67db416
commit cedbc50
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
@@ -4593,8 +4593,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;
 	}