summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2017-10-12 15:37:47 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2017-10-15 13:19:17 +0200
commitfb0902143291c8b605997a6b2a8f8717289a44d1 (patch)
tree5c0ad7454d09641885f5d81f4ae6fff66ee9e11e
parent816758eda2bcdd69ba505fb6bbb79124a7bf2254 (diff)
downloadphp-git-fb0902143291c8b605997a6b2a8f8717289a44d1.tar.gz
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.
-rw-r--r--NEWS3
-rw-r--r--ext/enchant/enchant.c1
-rw-r--r--ext/enchant/php_enchant.h2
3 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index de12a7f586..963b936ef5 100644
--- 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 c51c51d6f2..88993b3014 100644
--- 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 731bf2c467..a4d83fa41e 100644
--- 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)