[Phpmyadmin-git] [phpmyadmin/phpmyadmin] f15214: [security] XSS with malicious ENUM values

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: f152146abe3163b8817769b4ec57c12d33807598
      https://github.com/phpmyadmin/phpmyadmin/commit/f152146abe3163b8817769b4ec57c12d33807598
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-01 (Wed, 01 Oct 2014)

  Changed paths:
    M libraries/TableSearch.class.php
    M libraries/Util.class.php

  Log Message:
  -----------
  [security] XSS with malicious ENUM values

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

Conflicts:
	libraries/Util.class.php


  Commit: ff4be7ee5a71f29921089d447e658630ef7cbfef
      https://github.com/phpmyadmin/phpmyadmin/commit/ff4be7ee5a71f29921089d447e658630ef7cbfef
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-01 (Wed, 01 Oct 2014)

  Changed paths:
    M libraries/TableSearch.class.php

  Log Message:
  -----------
  Bug 4544: additional fix for 4.2.x

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7ff7929a8ee4...ff4be7ee5a71