[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 19f153: Fixed error in PR : 11569

[Marc Delisle]

  Branch: refs/heads/QA_4_5
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 19f1536a1c0eaa7b4280bb0a0840ce01614e656c
      https://github.com/phpmyadmin/phpmyadmin/commit/19f1536a1c0eaa7b4280bb0a0840ce01614e656c
  Author: Deven Bansod <devenbansod.bits at gmail.com>
  Date:   2015-10-16 (Fri, 16 Oct 2015)

  Changed paths:
    M libraries/display_change_password.lib.php
    M libraries/server_privileges.lib.php
    M test/libraries/PMA_display_change_password_test.php
    M user_password.php

  Log Message:
  -----------
  Fixed error in PR : 11569

Signed-off-by: Deven Bansod <devenbansod.bits at gmail.com>


  Commit: b0f8d1df21ffddc29d6080a0a43afa049442e04f
      https://github.com/phpmyadmin/phpmyadmin/commit/b0f8d1df21ffddc29d6080a0a43afa049442e04f
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-10-15 (Thu, 15 Oct 2015)

  Changed paths:
    M libraries/display_change_password.lib.php
    M libraries/server_privileges.lib.php
    M test/libraries/PMA_display_change_password_test.php
    M user_password.php

  Log Message:
  -----------
  Merge pull request #11570 from devenbansod/fix_error_in_11569

Fixed error in PR : 11569


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6292f6d70796...b0f8d1df21ff