diff options
| author | mattpiwik <matthieu.aubry@gmail.com> | 2012-02-12 04:45:02 +0400 |
|---|---|---|
| committer | mattpiwik <matthieu.aubry@gmail.com> | 2012-02-12 04:45:02 +0400 |
| commit | 2a9348ca16cfe1e893136d706c67191ae47e90cb (patch) | |
| tree | 7062285dc96f2aa337c20014010527074495c01a /config | |
| parent | 8dd9d346247302394867422a6efcdef4580c28ec (diff) | |
Style
git-svn-id: http://dev.piwik.org/svn/trunk@5814 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'config')
| -rw-r--r-- | config/global.ini.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config/global.ini.php b/config/global.ini.php index d0a1883194..fc3ddb1963 100644 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -180,7 +180,11 @@ login_password_recovery_email_address = "password-recovery@{DOMAIN}" ; name that appears as a Sender in the password recovery email login_password_recovery_email_name = Piwik -; Set to 1 to disable the framebuster on the Login page (a click-jacking countermeasure). +; Set to 1 to disable the framebuster on standard Non-widgets pages (a click-jacking countermeasure). +; Default is 0 (i.e., bust frames on all non Widget pages such as Login, API, Widgets, Email reports, etc.). +enable_framed_pages = 0 + +; Set to 1 to disable the framebuster on the Login page only (a click-jacking countermeasure). ; Default is 0 (i.e., bust frames on the Login forms). enable_framed_logins = 0 @@ -188,10 +192,6 @@ enable_framed_logins = 0 ; Default is 0 (i.e., bust frames on the Settings forms). enable_framed_settings = 0 -; Set to 1 to disable the framebuster on standard Non-widgets pages (a click-jacking countermeasure). -; Default is 0 (i.e., bust frames on all non Widget pages such as API, Widgets, Email reports, etc.). -enable_framed_pages = 0 - ; language cookie name for session language_cookie_name = piwik_lang |