diff options
author | Arthur <arthur@hoa.ro> | 2016-07-10 10:45:01 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-10 10:45:01 +0200 |
commit | b6e58bab8a77f097e1e7de32edc992298f164897 (patch) | |
tree | 680de0e42803b2ad4ff36cd4268022c213ceb793 | |
parent | 0c4c7ae818336d5b0f94562e551ca1a3f34d3435 (diff) | |
parent | 2e193ad387769e62408849dd232c4013c5134225 (diff) | |
download | Shaarli-b6e58bab8a77f097e1e7de32edc992298f164897.tar.gz Shaarli-b6e58bab8a77f097e1e7de32edc992298f164897.tar.zst Shaarli-b6e58bab8a77f097e1e7de32edc992298f164897.zip |
Merge pull request #596 from ArthurHoaro/hotfix/pluginmanager-tpl-var
Fix session_protection_disabled variable in configure.php
-rw-r--r-- | index.php | 1 | ||||
-rw-r--r-- | tpl/configure.html | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -1159,6 +1159,7 @@ function renderPage($conf, $pluginManager) | |||
1159 | $PAGE->assign('timezone_form', $timezone_form); | 1159 | $PAGE->assign('timezone_form', $timezone_form); |
1160 | $PAGE->assign('timezone_js',$timezone_js); | 1160 | $PAGE->assign('timezone_js',$timezone_js); |
1161 | $PAGE->assign('private_links_default', $conf->get('privacy.default_private_links', false)); | 1161 | $PAGE->assign('private_links_default', $conf->get('privacy.default_private_links', false)); |
1162 | $PAGE->assign('session_protection_disabled', $conf->get('security.session_protection_disabled', false)); | ||
1162 | $PAGE->assign('enable_rss_permalinks', $conf->get('feed.rss_permalinks', false)); | 1163 | $PAGE->assign('enable_rss_permalinks', $conf->get('feed.rss_permalinks', false)); |
1163 | $PAGE->assign('enable_update_check', $conf->get('updates.check_updates', true)); | 1164 | $PAGE->assign('enable_update_check', $conf->get('updates.check_updates', true)); |
1164 | $PAGE->assign('hide_public_links', $conf->get('privacy.hide_public_links', false)); | 1165 | $PAGE->assign('hide_public_links', $conf->get('privacy.hide_public_links', false)); |
diff --git a/tpl/configure.html b/tpl/configure.html index ad9a2085..983bcd08 100644 --- a/tpl/configure.html +++ b/tpl/configure.html | |||
@@ -36,7 +36,7 @@ | |||
36 | <td><b>Security:</b></td> | 36 | <td><b>Security:</b></td> |
37 | <td> | 37 | <td> |
38 | <input type="checkbox" name="disablesessionprotection" id="disablesessionprotection" | 38 | <input type="checkbox" name="disablesessionprotection" id="disablesessionprotection" |
39 | {if="$private_links_default"}checked{/if}> | 39 | {if="$session_protection_disabled"}checked{/if}> |
40 | <label | 40 | <label |
41 | for="disablesessionprotection"> Disable session cookie hijacking protection (Check this if you get | 41 | for="disablesessionprotection"> Disable session cookie hijacking protection (Check this if you get |
42 | disconnected often or if your IP address changes often.)</label> | 42 | disconnected often or if your IP address changes often.)</label> |