Fixes #12802 custom fo… #12825

Closed
wants to merge 1 commit into
from

Projects

None yet

4 participants

@Gregory-Buhler
Contributor

…oter now shown with auth_type http failed login

Signed-off-by: Gregory Buhler Gregory@GregBWebDev.Tech

Before submitting pull request, please check that every commit:

  • Has proper Signed-Off-By
  • Has commit message which describes it
  • Is needed on it's own, if you have just minor fixes to previous commits, you can squash them
  • [N/A] Any new functionality is covered by tests
@Gregory-Buhler Gregory-Buhler changed the title from Fixes https://github.com/phpmyadmin/phpmyadmin/issues/12802 custom fo… to Fixes #12802 custom fo… Dec 18, 2016
@codecov-io

Current coverage is 54.23% (diff: 14.28%)

Merging #12825 into master will decrease coverage by <.01%

@@             master     #12825   diff @@
==========================================
  Files           466        466          
  Lines         69638      69645     +7   
  Methods        2122       2122          
  Messages          0          0          
  Branches          0          0          
==========================================
+ Hits          37773      37774     +1   
- Misses        31865      31871     +6   
  Partials          0          0          

Powered by Codecov. Last update c16f1eb...f44de38

@codecov-io
codecov-io commented Dec 18, 2016 edited

Current coverage is 54.23% (diff: 14.28%)

Merging #12825 into master will decrease coverage by <.01%

@@             master     #12825   diff @@
==========================================
  Files           466        466          
  Lines         69638      69643     +5   
  Methods        2122       2122          
  Messages          0          0          
  Branches          0          0          
==========================================
  Hits          37773      37773          
- Misses        31865      31870     +5   
  Partials          0          0          

Powered by Codecov. Last update 2a6b05d...dcce6fa

@ibennetch
Contributor

I can't fully test this at the moment due to #12828.

At the moment, it appears that with auth_type cookie, the footer is displayed twice with your patch.

Gregory Buhler Fixes phpmyadmin/phpmyadmin#12802 custom footer now shown with auth_t…
…ype http failed login

Signed-off-by: Gregory Buhler <Gregory@GregBWebDev.Tech>
dcce6fa
@Gregory-Buhler
Contributor

@ibennetch I realized that there were two different calls for the file, this works on my end, let me know if you're still ending up with the same issue on yours.

Cheers!

@nijel

I've rather rewritten the logic to be same in all places in 7d36180, this looks like cleaner approach to me.

+ $retval .= ob_get_contents();
+ ob_end_clean();
+ $retval .= '</div>';
+ }
@nijel
nijel Dec 19, 2016 Member

This will lead to footer being render twice on normal pages, it is rendered for second time here: https://github.com/phpmyadmin/phpmyadmin/pull/12825/files#diff-80f5c35c397813b410d4ab117d9b0ac2L352

@nijel nijel self-assigned this Dec 19, 2016
@nijel nijel closed this Dec 19, 2016
@Gregory-Buhler Gregory-Buhler deleted the Gregory-Buhler:iss12802 branch Dec 20, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment