Merge pull request #771 from Tithugues/fix-4157-v2

Fix 4157: Display error message when using "Change Login Information / Copy User" dialog to update password
phpmyadmin · Dec 1, 2013 · 7b581ff · 7b581ff
2 parents 0d74b94 + 8b5c1ae
commit 7b581ff
Show file tree

Hide file tree

Showing 75 changed files with 12,280 additions and 12,330 deletions.
diff --git a/po/af.po b/po/af.po
diff --git a/po/ar.po b/po/ar.po
diff --git a/po/az.po b/po/az.po
diff --git a/po/be.po b/po/be.po
diff --git a/po/be@latin.po b/po/be@latin.po
diff --git a/po/bg.po b/po/bg.po
diff --git a/po/bn.po b/po/bn.po
diff --git a/po/br.po b/po/br.po
diff --git a/po/bs.po b/po/bs.po
diff --git a/po/ca.po b/po/ca.po
diff --git a/po/ckb.po b/po/ckb.po
diff --git a/po/cs.po b/po/cs.po
diff --git a/po/cy.po b/po/cy.po
diff --git a/po/da.po b/po/da.po
diff --git a/po/de.po b/po/de.po
diff --git a/po/el.po b/po/el.po
diff --git a/po/en_GB.po b/po/en_GB.po
diff --git a/po/es.po b/po/es.po
diff --git a/po/et.po b/po/et.po
diff --git a/po/eu.po b/po/eu.po
diff --git a/po/fa.po b/po/fa.po
diff --git a/po/fi.po b/po/fi.po
diff --git a/po/fr.po b/po/fr.po
diff --git a/po/gl.po b/po/gl.po
diff --git a/po/he.po b/po/he.po
diff --git a/po/hi.po b/po/hi.po
diff --git a/po/hr.po b/po/hr.po
diff --git a/po/hu.po b/po/hu.po
diff --git a/po/hy.po b/po/hy.po
diff --git a/po/ia.po b/po/ia.po
diff --git a/po/id.po b/po/id.po
diff --git a/po/it.po b/po/it.po
diff --git a/po/ja.po b/po/ja.po
diff --git a/po/ka.po b/po/ka.po
diff --git a/po/kk.po b/po/kk.po
diff --git a/po/kn.po b/po/kn.po
diff --git a/po/ko.po b/po/ko.po
diff --git a/po/ky.po b/po/ky.po
diff --git a/po/lt.po b/po/lt.po
diff --git a/po/lv.po b/po/lv.po
diff --git a/po/mk.po b/po/mk.po
diff --git a/po/ml.po b/po/ml.po
diff --git a/po/mn.po b/po/mn.po
diff --git a/po/ms.po b/po/ms.po
diff --git a/po/nb.po b/po/nb.po
diff --git a/po/nl.po b/po/nl.po
diff --git a/po/pa.po b/po/pa.po
diff --git a/po/phpmyadmin.pot b/po/phpmyadmin.pot
diff --git a/po/pl.po b/po/pl.po
diff --git a/po/pt.po b/po/pt.po
diff --git a/po/pt_BR.po b/po/pt_BR.po
diff --git a/po/ro.po b/po/ro.po
diff --git a/po/ru.po b/po/ru.po
diff --git a/po/si.po b/po/si.po
diff --git a/po/sk.po b/po/sk.po
diff --git a/po/sl.po b/po/sl.po
diff --git a/po/sq.po b/po/sq.po
diff --git a/po/sr.po b/po/sr.po
diff --git a/po/sr@latin.po b/po/sr@latin.po
diff --git a/po/sv.po b/po/sv.po
diff --git a/po/ta.po b/po/ta.po
diff --git a/po/te.po b/po/te.po
diff --git a/po/th.po b/po/th.po
diff --git a/po/tk.po b/po/tk.po
diff --git a/po/tr.po b/po/tr.po
diff --git a/po/tt.po b/po/tt.po
diff --git a/po/ug.po b/po/ug.po
diff --git a/po/uk.po b/po/uk.po
diff --git a/po/ur.po b/po/ur.po
diff --git a/po/uz.po b/po/uz.po
diff --git a/po/uz@latin.po b/po/uz@latin.po
diff --git a/po/vls.po b/po/vls.po
diff --git a/po/zh_CN.po b/po/zh_CN.po
diff --git a/po/zh_TW.po b/po/zh_TW.po
diff --git a/server_privileges.php b/server_privileges.php
@@ -131,6 +131,20 @@
     exit;
 }
 
+/**
+ * Checks if the user is using "Change Login Information / Copy User" dialog
+ * only to update the password
+ */
+if (isset($_REQUEST['change_copy']) && $username == $_REQUEST['old_username']
+    && $hostname == $_REQUEST['old_hostname']
+) {
+    $response->addHTML(
+        PMA_Message::error(__('Username and hostname didn\'t change.'))->getDisplay()
+    );
+    $response->isSuccess(false);
+    exit;
+}
+
 /**
  * Changes / copies a user, part I
  */