[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 5998c1: Fix #11457 414 Request-URI Too Large

[Marc Delisle]

  Branch: refs/heads/QA_4_5
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 5998c1de536fbb11cd84453705bb3b5c78209ad6
      https://github.com/phpmyadmin/phpmyadmin/commit/5998c1de536fbb11cd84453705bb3b5c78209ad6
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-09-04 (Fri, 04 Sep 2015)

  Changed paths:
    M libraries/Scripts.class.php

  Log Message:
  -----------
  Fix #11457 414 Request-URI Too Large

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: fdd26da4bf14d10a47207711d7d2af3e997796bb
      https://github.com/phpmyadmin/phpmyadmin/commit/fdd26da4bf14d10a47207711d7d2af3e997796bb
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-09-04 (Fri, 04 Sep 2015)

  Changed paths:
    M libraries/Scripts.class.php

  Log Message:
  -----------
  Merge pull request #11459 from madhuracj/issue11457

Fix #11457 414 Request-URI Too Large


  Commit: 84a60be19c898a84caceaebecf6e058b2ffe0852
      https://github.com/phpmyadmin/phpmyadmin/commit/84a60be19c898a84caceaebecf6e058b2ffe0852
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-09-04 (Fri, 04 Sep 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry

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


  Commit: ec4a023b49a8aaad2602e8f36650b29aada769d3
      https://github.com/phpmyadmin/phpmyadmin/commit/ec4a023b49a8aaad2602e8f36650b29aada769d3
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-09-04 (Fri, 04 Sep 2015)

  Changed paths:
    M ChangeLog
    M libraries/Scripts.class.php

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

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/08005965d0cf...ec4a023b49a8