diff options
| author | VirtualTam <virtualtam@flibidi.net> | 2017-08-23 01:26:03 +0200 |
|---|---|---|
| committer | VirtualTam <virtualtam@flibidi.net> | 2017-08-23 01:26:03 +0200 |
| commit | 2c049b673acdd10125db9c3c271eef5bd3f5fc17 (patch) | |
| tree | da67c958941502dd9c10d82be747559bbe2a062a /application/config/ConfigManager.php | |
| parent | bf82dcfeb38418f0b3d0f14f6c666ed04651e08f (diff) | |
| parent | 1ea88ae7d1b7fb13e18f543e7c2ad99c4ccde19a (diff) | |
| download | Shaarli-2c049b673acdd10125db9c3c271eef5bd3f5fc17.tar.gz Shaarli-2c049b673acdd10125db9c3c271eef5bd3f5fc17.tar.zst Shaarli-2c049b673acdd10125db9c3c271eef5bd3f5fc17.zip | |
Merge remote-tracking branch 'upstream/v0.9' into latest
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
Diffstat (limited to 'application/config/ConfigManager.php')
| -rw-r--r-- | application/config/ConfigManager.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/application/config/ConfigManager.php b/application/config/ConfigManager.php index 86a917fb..8eab26f1 100644 --- a/application/config/ConfigManager.php +++ b/application/config/ConfigManager.php | |||
| @@ -312,6 +312,7 @@ class ConfigManager | |||
| 312 | $this->setEmpty('security.ban_duration', 1800); | 312 | $this->setEmpty('security.ban_duration', 1800); |
| 313 | $this->setEmpty('security.session_protection_disabled', false); | 313 | $this->setEmpty('security.session_protection_disabled', false); |
| 314 | $this->setEmpty('security.open_shaarli', false); | 314 | $this->setEmpty('security.open_shaarli', false); |
| 315 | $this->setEmpty('security.allowed_protocols', ['ftp', 'ftps', 'magnet']); | ||
| 315 | 316 | ||
| 316 | $this->setEmpty('general.header_link', '?'); | 317 | $this->setEmpty('general.header_link', '?'); |
| 317 | $this->setEmpty('general.links_per_page', 20); | 318 | $this->setEmpty('general.links_per_page', 20); |