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 85fb3361a8bbadb80319aa4ab450a5dfbb01dd21..21342edd852062d035461c82f233e4efeb4dd356 100644 (file)
--- 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;
        }