diff options
| author | Udo Walter | 2017-11-21 17:52:04 +0100 |
|---|---|---|
| committer | Udo Walter | 2017-11-21 17:52:04 +0100 |
| commit | 653851f35d0eea172c2302e9f1b6f0d03c70096c (patch) | |
| tree | 42f267c360104b98d2e3199273adba62a1e2023b /modules-available/baseconfig | |
| parent | [internetaccess] reworked permission system from "click and you get error" to... (diff) | |
| parent | [statistics] Also adapt MAC-UUID fixing code to mltk changes (diff) | |
| download | slx-admin-653851f35d0eea172c2302e9f1b6f0d03c70096c.tar.gz slx-admin-653851f35d0eea172c2302e9f1b6f0d03c70096c.tar.xz slx-admin-653851f35d0eea172c2302e9f1b6f0d03c70096c.zip | |
Merge remote-tracking branch 'origin/master' into permission-manager
# Conflicts:
# modules-available/backup/templates/_page.html
# style/default.css
Diffstat (limited to 'modules-available/baseconfig')
| -rw-r--r-- | modules-available/baseconfig/api.inc.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules-available/baseconfig/api.inc.php b/modules-available/baseconfig/api.inc.php index 6e985050..64204774 100644 --- a/modules-available/baseconfig/api.inc.php +++ b/modules-available/baseconfig/api.inc.php @@ -75,7 +75,7 @@ class ConfigHolder if ($pos == 0) { echo " <disabled>\n"; } else { - echo ': ', str_replace(array("\r", "\n"), array('\r', '\n'), $item['value']), "\n"; + echo " <overridden>\n"; } continue; } |