extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-05 13:39:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

do NOT load categories.php?app=phpgw for login page

Browse Source 
It gives an error as no user is logged in, which is served as text/html, which then gives an error in browser, as it conflicts with X-Content-Type-Options: nosniff
This commit is contained in:
Ralf Becker 2020-01-28 18:56:54 +01:00
parent 57ab6f667c
commit ec31d93af2
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/src/Framework.php
View File

@ -96,7 +96,7 @@ abstract class Framework extends Framework\Extra
/** /**
* Factory method to instanciate framework object * Factory method to instanciate framework object
* *
* @return egw_framwork * @return self
*/ */
public static function factory() public static function factory()
{ {
@ -932,7 +932,10 @@ abstract class Framework extends Framework\Extra
self::includeCSS($theme_min_css); self::includeCSS($theme_min_css);
// Global category styles // Global category styles
Categories::css(Categories::GLOBAL_APPNAME); if (basename($_SERVER['PHP_SELF']) !== 'login.php')
{
Categories::css(Categories::GLOBAL_APPNAME);
}
} }
else else
{ {
@ -949,7 +952,10 @@ abstract class Framework extends Framework\Extra
self::includeCSS('/api/templates/default/etemplate2.css'); self::includeCSS('/api/templates/default/etemplate2.css');
// Category styles // Category styles
Categories::css(Categories::GLOBAL_APPNAME); if (basename($_SERVER['PHP_SELF']) !== 'login.php')
{
Categories::css(Categories::GLOBAL_APPNAME);
}
self::includeCSS($theme_css); self::includeCSS($theme_css);