[phpMyAdmin Git] [phpmyadmin/phpmyadmin] e3a4bf: Fix display of custom header and footer in certain...

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: e3a4bfe75706225de084681b54c6e5a054bf5814
      https://github.com/phpmyadmin/phpmyadmin/commit/e3a4bfe75706225de084681b54c6e5a054bf5814
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2016-12-14 (Wed, 14 Dec 2016)

  Changed paths:
    M ChangeLog
    M libraries/plugins/auth/AuthenticationCookie.php
    M libraries/plugins/auth/AuthenticationHttp.php

  Log Message:
  -----------
  Fix display of custom header and footer in certain edge cases.
Issues #12801 and #12802

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>


  Commit: e267c6f9af2a8a4f9c272e9ad48de94e8c96c036
      https://github.com/phpmyadmin/phpmyadmin/commit/e267c6f9af2a8a4f9c272e9ad48de94e8c96c036
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-19 (Mon, 19 Dec 2016)

  Changed paths:
    M ChangeLog
    M libraries/plugins/auth/AuthenticationCookie.php
    M libraries/plugins/auth/AuthenticationHttp.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/pull/12803' into tmp


  Commit: 7d361806c353911b2828053dc2e92fa270852838
      https://github.com/phpmyadmin/phpmyadmin/commit/7d361806c353911b2828053dc2e92fa270852838
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-19 (Mon, 19 Dec 2016)

  Changed paths:
    M libraries/Config.php
    M libraries/Footer.php
    M libraries/Header.php
    M libraries/plugins/auth/AuthenticationCookie.php
    M libraries/plugins/auth/AuthenticationHttp.php

  Log Message:
  -----------
  Share code for rendering custom header and footer

Fixes #12802

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 945e615253a8a5370ccfb0f1e1504c9be2b0055a
      https://github.com/phpmyadmin/phpmyadmin/commit/945e615253a8a5370ccfb0f1e1504c9be2b0055a
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-19 (Mon, 19 Dec 2016)

  Changed paths:
    M ChangeLog
    M libraries/Config.php
    M libraries/Footer.php
    M libraries/Header.php
    M libraries/plugins/auth/AuthenticationCookie.php
    M libraries/plugins/auth/AuthenticationHttp.php

  Log Message:
  -----------
  Merge branch 'QA_4_6'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2fd4e4b2aec9...945e615253a8