aboutsummaryrefslogtreecommitdiffhomepage
path: root/index.php
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2018-03-14 18:25:22 +0100
committerGitHub <noreply@github.com>2018-03-14 18:25:22 +0100
commit60a94dab22b6ff1fe414ba98b90dbaaf741cadef (patch)
tree093b2ce2ca9f1fb25dbeb30ae731f46373e9ab0c /index.php
parent4294bc7b98c8f45ceaac867cad3d5d35ee9eb096 (diff)
parent15410df1131c10b835ca69a7cbf1f0119b1da374 (diff)
downloadShaarli-60a94dab22b6ff1fe414ba98b90dbaaf741cadef.tar.gz
Shaarli-60a94dab22b6ff1fe414ba98b90dbaaf741cadef.tar.zst
Shaarli-60a94dab22b6ff1fe414ba98b90dbaaf741cadef.zip
Merge pull request #1102 from ArthurHoaro/fix/settings-warning
Fix warning when trying to save redictor setting from the configure page
Diffstat (limited to 'index.php')
-rw-r--r--index.php2
1 files changed, 0 insertions, 2 deletions
diff --git a/index.php b/index.php
index f7f87d95..dbc2bb3b 100644
--- a/index.php
+++ b/index.php
@@ -1093,7 +1093,6 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
1093 $conf->set('general.title', escape($_POST['title'])); 1093 $conf->set('general.title', escape($_POST['title']));
1094 $conf->set('general.header_link', escape($_POST['titleLink'])); 1094 $conf->set('general.header_link', escape($_POST['titleLink']));
1095 $conf->set('resource.theme', escape($_POST['theme'])); 1095 $conf->set('resource.theme', escape($_POST['theme']));
1096 $conf->set('redirector.url', escape($_POST['redirector']));
1097 $conf->set('security.session_protection_disabled', !empty($_POST['disablesessionprotection'])); 1096 $conf->set('security.session_protection_disabled', !empty($_POST['disablesessionprotection']));
1098 $conf->set('privacy.default_private_links', !empty($_POST['privateLinkByDefault'])); 1097 $conf->set('privacy.default_private_links', !empty($_POST['privateLinkByDefault']));
1099 $conf->set('feed.rss_permalinks', !empty($_POST['enableRssPermalinks'])); 1098 $conf->set('feed.rss_permalinks', !empty($_POST['enableRssPermalinks']));
@@ -1126,7 +1125,6 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
1126 $PAGE->assign('title', $conf->get('general.title')); 1125 $PAGE->assign('title', $conf->get('general.title'));
1127 $PAGE->assign('theme', $conf->get('resource.theme')); 1126 $PAGE->assign('theme', $conf->get('resource.theme'));
1128 $PAGE->assign('theme_available', ThemeUtils::getThemes($conf->get('resource.raintpl_tpl'))); 1127 $PAGE->assign('theme_available', ThemeUtils::getThemes($conf->get('resource.raintpl_tpl')));
1129 $PAGE->assign('redirector', $conf->get('redirector.url'));
1130 list($continents, $cities) = generateTimeZoneData( 1128 list($continents, $cities) = generateTimeZoneData(
1131 timezone_identifiers_list(), 1129 timezone_identifiers_list(),
1132 $conf->get('general.timezone') 1130 $conf->get('general.timezone')