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/sysconfig/page.inc.php | |
| 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/sysconfig/page.inc.php')
| -rw-r--r-- | modules-available/sysconfig/page.inc.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules-available/sysconfig/page.inc.php b/modules-available/sysconfig/page.inc.php index c169f490..043645df 100644 --- a/modules-available/sysconfig/page.inc.php +++ b/modules-available/sysconfig/page.inc.php @@ -197,7 +197,7 @@ class Page_SysConfig extends Page $res = Database::simpleQuery("SELECT c.configid, c.title, c.filepath, c.status," . " GROUP_CONCAT(DISTINCT cl.locationid) AS loclist, GROUP_CONCAT(cxm.moduleid) AS modlist" . " FROM configtgz c" - . " INNER JOIN configtgz_x_module cxm USING (configid)" + . " LEFT JOIN configtgz_x_module cxm USING (configid)" . " LEFT JOIN configtgz_location cl ON (c.configid = cl.configid)" . " GROUP BY configid" . " ORDER BY title ASC"); |