diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2017-10-15 13:21:37 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2017-10-15 13:30:06 +0200 |
| commit | fd993b10455e61e209c2d0a5a3dfaec4baf6d116 (patch) | |
| tree | 333fc4458adb568d456efe30533f8aef1c70618f | |
| parent | b9b2ae703ccbc76ef817aaa15d7d91a994a775cb (diff) | |
| parent | fb0902143291c8b605997a6b2a8f8717289a44d1 (diff) | |
| download | php-git-fd993b10455e61e209c2d0a5a3dfaec4baf6d116.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #75365 (Enchant still reports version 1.1.0)
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/enchant/enchant.c | 1 | ||||
| -rw-r--r-- | ext/enchant/php_enchant.h | 2 |
3 files changed, 4 insertions, 2 deletions
@@ -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 77f6840161..10e3572eb1 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) |