Fixed bug #75365 (Enchant still reports version 1.1.0)

Since Enchant is bundled, we make `PHP_ENCHANT_VERSION` an alias of
`PHP_VERSION` and also drop the rather meaningless revision hash from
the PHP info.

diff --git a/NEWS b/NEWS
index de12a7f586cdc03f59c1b7d32467c6eab9aaa453..963b936ef5e25ab9cf7627d6f2bdad537d5b0287 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,9 @@ PHP                                                                        NEWS
   . Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown
     function). (Laruence)
 
+- Enchant:
+  . Fixed bug #75365 (Enchant still reports version 1.1.0). (cmb)
+
 - Exif:
   . Fixed bug #75301 (Exif extension has built in revision version). (Peter
     Kokot)

diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c
index c51c51d6f22a479be5b772bc7d9ccc64e9c0db31..88993b3014dbddf71eb37d2bbe2e47c51ae81fbe 100644 (file)
--- a/ext/enchant/enchant.c
+++ b/ext/enchant/enchant.c
@@ -323,7 +323,6 @@ PHP_MINFO_FUNCTION(enchant)
 #elif defined(HAVE_ENCHANT_BROKER_SET_PARAM)
        php_info_print_table_row(2, "Libenchant Version", "1.5.0 or later");
 #endif
-       php_info_print_table_row(2, "Revision", "$Id$");
        php_info_print_table_end();
 
        php_info_print_table_start();

diff --git a/ext/enchant/php_enchant.h b/ext/enchant/php_enchant.h
index 731bf2c4675428c7f0ec7b74d51d012027b9f582..a4d83fa41e4bd5f1baa2aea218f9cdc24bb3b91a 100644 (file)
--- a/ext/enchant/php_enchant.h
+++ b/ext/enchant/php_enchant.h
@@ -24,7 +24,7 @@
 extern zend_module_entry enchant_module_entry;
 #define phpext_enchant_ptr &enchant_module_entry
 
-#define PHP_ENCHANT_VERSION "1.1.0"
+#define PHP_ENCHANT_VERSION PHP_VERSION
 
 #ifdef PHP_WIN32
 #define PHP_ENCHANT_API __declspec(dllexport)