diff options
Diffstat (limited to 'core/Plugin/Controller.php')
| -rw-r--r-- | core/Plugin/Controller.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/Plugin/Controller.php b/core/Plugin/Controller.php index a8125e47de..f16d4c694b 100644 --- a/core/Plugin/Controller.php +++ b/core/Plugin/Controller.php @@ -456,8 +456,9 @@ abstract class Controller $view->logoSVG = \Piwik\Plugins\API\API::getInstance()->getSVGLogoUrl(); $view->hasSVGLogo = \Piwik\Plugins\API\API::getInstance()->hasSVGLogo(); - $view->enableFrames = PiwikConfig::getInstance()->General['enable_framed_pages'] - || @PiwikConfig::getInstance()->General['enable_framed_logins']; + $general = PiwikConfig::getInstance()->General; + $view->enableFrames = $general['enable_framed_pages'] + || (isset($general['enable_framed_logins']) && $general['enable_framed_logins']); if (!$view->enableFrames) { $view->setXFrameOptions('sameorigin'); } |