[Phpmyadmin-git] [phpmyadmin/phpmyadmin] cfa542: Bug #4845 White screen (Cloudflare)

[Marc Delisle]

  Branch: refs/heads/QA_4_4
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: cfa542cfa9b8e9869c5a6c55d7db594261a93548
      https://github.com/phpmyadmin/phpmyadmin/commit/cfa542cfa9b8e9869c5a6c55d7db594261a93548
  Author: Ryan Stasel <staze at staze.org>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M libraries/Scripts.class.php

  Log Message:
  -----------
  Bug #4845 White screen (Cloudflare)

Signed-off-by: Ryan Stasel <staze at staze.org>


  Commit: 6806cff46857acf6b89e4670932bc1956cbaaf58
      https://github.com/phpmyadmin/phpmyadmin/commit/6806cff46857acf6b89e4670932bc1956cbaaf58
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M ChangeLog

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

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


  Commit: 0acbf9954955a94f9373ea65cc38536689d8bac4
      https://github.com/phpmyadmin/phpmyadmin/commit/0acbf9954955a94f9373ea65cc38536689d8bac4
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M test/classes/PMA_Footer_test.php
    M test/classes/PMA_Scripts_test.php

  Log Message:
  -----------
  Fix unit tests for Cloudflare support

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


  Commit: c16798e0b41ae52fb0bb5f05dbc7501ecd31ea7d
      https://github.com/phpmyadmin/phpmyadmin/commit/c16798e0b41ae52fb0bb5f05dbc7501ecd31ea7d
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M ChangeLog
    M libraries/Util.class.php
    M po/ca.po
    M po/fr.po

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

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ff8b956d2bbe...c16798e0b41a