fix for bug #32947 (Incorrect option for mysqli default password)

diff --git a/php.ini-dist b/php.ini-dist
index bcec02634b18ddd097fc21fe488c15f15320a76f..ed3c5301d5fb16def5c325a772b107bc075dec6d 100644 (file)
--- a/php.ini-dist
+++ b/php.ini-dist
@@ -726,10 +726,10 @@ mysqli.default_user =
 
 ; Default password for mysqli_connect() (doesn't apply in safe mode).
 ; Note that this is generally a *bad* idea to store passwords in this file.
-; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_password")
+; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw")
 ; and reveal this password!  And of course, any users with read access to this
 ; file will be able to reveal the password as well.
-mysqli.default_password =
+mysqli.default_pw =
 
 ; Allow or prevent reconnect
 mysqli.reconnect = Off

diff --git a/php.ini-recommended b/php.ini-recommended
index 6a98158e2c92a0ae2f5882bf7b9006ef112df280..a7718ebb662cd18d4959246d602967af44541933 100644 (file)
--- a/php.ini-recommended
+++ b/php.ini-recommended
@@ -784,10 +784,10 @@ mysqli.default_user =
 
 ; Default password for mysqli_connect() (doesn't apply in safe mode).
 ; Note that this is generally a *bad* idea to store passwords in this file.
-; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_password")
+; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw")
 ; and reveal this password!  And of course, any users with read access to this
 ; file will be able to reveal the password as well.
-mysqli.default_password =
+mysqli.default_pw =
 
 ; Allow or prevent reconnect
 mysqli.reconnect = Off