diff options
| author | Matthieu Aubry <mattab@users.noreply.github.com> | 2018-11-04 21:02:28 +0300 |
|---|---|---|
| committer | Thomas Steur <tsteur@users.noreply.github.com> | 2018-11-04 21:02:28 +0300 |
| commit | b39563cda4256073b77ec7f357c9bf8f8fa8da01 (patch) | |
| tree | eee7d0d87db075030b978ad28efce0129ba1129d /config | |
| parent | b178978b979c5dcf20fe81a9b28034c0de4ce90e (diff) | |
Show the CORS settings in the UI when enable_general_settings_admin=0 (#13660)
* Show the CORS settings in the UI when enable_general_settings_admin=0
The INI setting description does not mean to include CORS:
```ini
; By setting this option to 0, the following settings will be hidden and disabled from being set in the UI:
; - "Archiving Settings"
; - "Update settings"
; - "Email server settings"
enable_general_settings_admin = 1
```
* improve the meaning of enable_general_settings_admin = 1
* Do not allow to configure trusted hostnames if general settings are disabled
Diffstat (limited to 'config')
| -rw-r--r-- | config/global.ini.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/config/global.ini.php b/config/global.ini.php index b689e782b0..e15f345891 100644 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -640,9 +640,10 @@ enable_geolocation_admin = 1 enable_delete_old_data_settings_admin = 1 ; By setting this option to 0, the following settings will be hidden and disabled from being set in the UI: -; - "Archiving Settings" -; - "Update settings" -; - "Email server settings" +; - Archiving settings +; - Update settings +; - Email server settings +; - Trusted Matomo Hostname enable_general_settings_admin = 1 ; Disabling this will disable features like automatic updates for Matomo, |