diff options
| author | ArthurHoaro <arthur@hoa.ro> | 2017-05-31 17:52:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-31 17:52:19 +0200 |
| commit | ac94db1e36c77d52c316b5fa4e8e36b9d1e38b9e (patch) | |
| tree | b235a4ed0e5291d7ad2f008df5bbed4d43200cbe /application/config/ConfigManager.php | |
| parent | 268309df5d8110f516940be06e9481d66f3fb5d6 (diff) | |
| parent | 86ceea054f5f85157b04473bac5bfb6ff86ca31f (diff) | |
| download | Shaarli-ac94db1e36c77d52c316b5fa4e8e36b9d1e38b9e.tar.gz Shaarli-ac94db1e36c77d52c316b5fa4e8e36b9d1e38b9e.tar.zst Shaarli-ac94db1e36c77d52c316b5fa4e8e36b9d1e38b9e.zip | |
Merge pull request #880 from ArthurHoaro/hotfix/allowed-protocols
Add a whitelist of protocols for URLs
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); |