[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 45550b: bug #4491 [security] Missing validation for access...

[Marc Delisle]

  Branch: refs/heads/MAINT_4_1_14
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 45550b8cff06ad128129020762f9b53d125a6934
      https://github.com/phpmyadmin/phpmyadmin/commit/45550b8cff06ad128129020762f9b53d125a6934
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-07-15 (Tue, 15 Jul 2014)

  Changed paths:
    M ChangeLog
    M server_user_groups.php

  Log Message:
  -----------
  bug #4491 [security] Missing validation for accessing User groups feature

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 2a211a595f6eb54db3d842ee23b6ff22ac608a14
      https://github.com/phpmyadmin/phpmyadmin/commit/2a211a595f6eb54db3d842ee23b6ff22ac608a14
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-07-17 (Thu, 17 Jul 2014)

  Changed paths:
    M ChangeLog
    M server_user_groups.php

  Log Message:
  -----------
  Fix merge conflict

Signed-off-by: Marc Delisle <marc at infomarc.info>


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/cd5697027a2e...2a211a595f6e