From c3c3d86216e81b7bf2855627a3f03a1ce37cc674 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Wed, 22 Oct 2008 17:03:22 +0000
Subject: [PATCH] bug #2187193 [interface] ShowChgPassword setting not
 respected

---
 ChangeLog                    | 1 +
 libraries/config.default.php | 2 +-
 main.php                     | 6 ++++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8a2c3c158..30de48375 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,6 +53,7 @@ index
 - bug #2163437 [core] Cannot disable PMA tables
 - bug #2184240 [lang] Problems with Italian language file, thanks to Luca
 Rebellato
+- bug #2187193 [interface] ShowChgPassword setting not respected
 
 3.0.0.0 (2008-09-27)
 + [export] properly handle line breaks for YAML, thanks to Dan Barry -
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 592716f62..6f3befbfc 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -757,7 +757,7 @@ $cfg['ShowServerInfo'] = true;
  *
  * @global boolean $cfg['ShowChgPassword']
  */
-$cfg['ShowChgPassword'] = false;
+$cfg['ShowChgPassword'] = true;
 
 /**
  * show create database form
diff --git a/main.php b/main.php
index dc38479d5..cc41fca50 100644
--- a/main.php
+++ b/main.php
@@ -86,8 +86,10 @@ if ($server > 0
 
         // Logout for advanced authentication
         if ($cfg['Server']['auth_type'] != 'config') {
-            PMA_printListItem($strChangePassword, 'li_change_password',
-                './user_password.php?' . $common_url_query);
+            if ($cfg['ShowChgPassword']) {
+                PMA_printListItem($strChangePassword, 'li_change_password',
+                    './user_password.php?' . $common_url_query);
+            }
 
             $http_logout = ($cfg['Server']['auth_type'] == 'http')
                          ? '<a href="./Documentation.html#login_bug" target="documentation">'