Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0: Fixed bug #75365 (Enchant still reports version 1.1.0)
kea · Oct 15, 2017 · fd993b1 · fd993b1
2 parents b9b2ae7 + fb09021
commit fd993b1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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)