MFH: - Fixed bug #31060 (imageftbbox() does not use linespacing parameter)

diff --git a/NEWS b/NEWS
index d306bbb6d2dfb16fafe7b7afce2470ddee5cdbc5..08b5177d714c6fc0c9ff69084a3279cd429db1da 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,7 @@ PHP                                                                        NEWS
 - Fixed bug #31087 (broken php_url_encode_hash macro). (Ilia)
 - Fixed bug #31072 (var_export() does not output an array element with an empty
   string key). (Derick)
+- Fixed bug #31060 (imageftbbox() does not use linespacing parameter). (Jani)
 - Fixed bug #31056 (php_std_date() returns invalid formatted date if 
   y2k_compliance is On). (Ilia)
 - Fixed bug #31055 (apache2filter: per request leak proportional to the full

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index f099f1b2bd195757a457d160f3adb64d4e027728..a96a453b7f203d23482230c09c7f1ae00d71b8c5 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -3150,9 +3150,10 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int
                col = Z_LVAL_PP(COL);
                y = Z_LVAL_PP(Y);
                x = Z_LVAL_PP(X);
+       }
 
 #if HAVE_GD_STRINGFTEX
-               if (EXT) {
+               if (extended && EXT) {
                        /* parse extended info */
 
                        HashPosition pos;
@@ -3184,8 +3185,6 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int
                }
 #endif
 
-       }
-
        ptsize = Z_DVAL_PP(PTSIZE);
        angle = Z_DVAL_PP(ANGLE) * (M_PI / 180); /* convert to radians */