com php-src: Fixed bug #75365 (Enchant still reports version 1.1.0): NEWS ext/enchant/enchant.c ext/enchant/php_enchant.h
| From: | Christoph Michael Becker | Date: | Sun, 15 Oct 2017 11:19:17 +0000 |
| Subject: | com php-src: Fixed bug #75365 (Enchant still reports version 1.1.0): NEWS ext/enchant/enchant.c ext/enchant/php_enchant.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-99744@lists.php.net to get a copy of this message | ||
Commit: fb0902143291c8b605997a6b2a8f8717289a44d1
Author: Christoph M. Becker <cmbecker69@gmx.de> Thu, 12 Oct 2017 15:37:47 +0200
Parents: 816758eda2bcdd69ba505fb6bbb79124a7bf2254
Branches: PHP-7.0 PHP-7..1 PHP-7.2 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fb0902143291c8b605997a6b2a8f8717289a44d1
Log:
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.
Bugs:
https://bugs.php.net/75365
Changed paths:
M NEWS
M ext/enchant/enchant.c
M ext/enchant/php_enchant.h
Diff:
diff --git a/NEWS b/NEWS
index de12a7f..963b936 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 c51c51d6..88993b3 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 731bf2c..a4d83fa 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)