From 3e7fcfae06ba47402ac8d468776f79c227ab4609 Mon Sep 17 00:00:00 2001 From: mattpiwik Date: Thu, 23 Feb 2012 04:26:46 +0000 Subject: Fixes #2940 * Remove enable_framed_logins since we now have the more general enable_framed_pages * Still backward compatible if user has set enable_framed_logins =1 in a previous version * updated the [http://piwik.org/faq/how-to/#faq_92 iframe login FAQ] * Also updated [http://piwik.org/faq/how-to/#faq_92 iframe FAQ] to include mention of the setting git-svn-id: http://dev.piwik.org/svn/trunk@5888 59fd770c-687e-43c8-a1e3-f5a4ff64c105 --- plugins/Login/Controller.php | 6 ------ 1 file changed, 6 deletions(-) (limited to 'plugins/Login') diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php index 4105603b83..84dd044484 100644 --- a/plugins/Login/Controller.php +++ b/plugins/Login/Controller.php @@ -97,12 +97,6 @@ class Piwik_Login_Controller extends Piwik_Controller $view->linkTitle = Piwik::getRandomTitle(); - $view->enableFrames = Zend_Registry::get('config')->General->enable_framed_logins; - if(!$view->enableFrames) - { - $view->setXFrameOptions('sameorigin'); - } - $view->forceSslLogin = Zend_Registry::get('config')->General->force_ssl_login; // crsf token: don't trust the submitted value; generate/fetch it from session data -- cgit v1.2.3