From 7f6ad37e5d58dd5238ffd85a74201e0251a6ce8c Mon Sep 17 00:00:00 2001
From: Peter Kokot <peterkokot@gmail.com>
Date: Tue, 22 Oct 2024 14:07:34 +0200
Subject: [PATCH] Sync exif and mbstring INI settings (#16549)

A follow-up of 9ee9c0e6748157198d0180920454bc203ee439a5.

The mbstring extension is added as ZEND_MOD_OPTIONAL dependency at
runtime, so INI directives configuration order here is no longer
relevant and can be done in any way.
---
 php.ini-development | 2 +-
 php.ini-production  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/php.ini-development b/php.ini-development
index 6e5064dd447..5adb11d2156 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -915,6 +915,7 @@ default_socket_timeout = 60
 ;
 ;extension=bz2
 ;extension=curl
+;extension=exif
 ;extension=ffi
 ;extension=ftp
 ;extension=fileinfo
@@ -924,7 +925,6 @@ default_socket_timeout = 60
 ;extension=intl
 ;extension=ldap
 ;extension=mbstring
-;extension=exif      ; Must be after mbstring as it depends on it
 ;extension=mysqli
 ;extension=odbc
 ;extension=openssl
diff --git a/php.ini-production b/php.ini-production
index c62faf52b67..e4ffc1084b1 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -917,6 +917,7 @@ default_socket_timeout = 60
 ;
 ;extension=bz2
 ;extension=curl
+;extension=exif
 ;extension=ffi
 ;extension=ftp
 ;extension=fileinfo
@@ -926,7 +927,6 @@ default_socket_timeout = 60
 ;extension=intl
 ;extension=ldap
 ;extension=mbstring
-;extension=exif      ; Must be after mbstring as it depends on it
 ;extension=mysqli
 ;extension=odbc
 ;extension=openssl