summaryrefslogtreecommitdiffstats
path: root/modules-available/sysconfig/inc/configtgz.inc.php
diff options
context:
space:
mode:
authorJannik Schönartz2017-12-28 15:55:49 +0100
committerJannik Schönartz2017-12-28 15:55:49 +0100
commit086c7458fe2c59dbb907755648362917c615404e (patch)
treea0ddf550223e628e70bcf9fe33096c1f000d2742 /modules-available/sysconfig/inc/configtgz.inc.php
parent[usb-lock-off] Switched to the _hw db structure. Adding a device and db contr... (diff)
parent[sysconfig] Restore long lost ajax functionality (diff)
downloadslx-admin-086c7458fe2c59dbb907755648362917c615404e.tar.gz
slx-admin-086c7458fe2c59dbb907755648362917c615404e.tar.xz
slx-admin-086c7458fe2c59dbb907755648362917c615404e.zip
Merge branch 'origin/master' into usb-lock-off
Diffstat (limited to 'modules-available/sysconfig/inc/configtgz.inc.php')
-rw-r--r--modules-available/sysconfig/inc/configtgz.inc.php10
1 files changed, 9 insertions, 1 deletions
diff --git a/modules-available/sysconfig/inc/configtgz.inc.php b/modules-available/sysconfig/inc/configtgz.inc.php
index dbf1bc99..17c9f35d 100644
--- a/modules-available/sysconfig/inc/configtgz.inc.php
+++ b/modules-available/sysconfig/inc/configtgz.inc.php
@@ -157,7 +157,6 @@ class ConfigTgz
{
if ($this->configId === 0)
Util::traceError('ConfigTgz::markUpdated called with invalid config id!');
- Event::activeConfigChanged();
if ($this->areAllModulesUpToDate())
return $this->mark('OK');
return $this->mark('OUTDATED');
@@ -232,6 +231,11 @@ class ConfigTgz
self::recompress([], SysConfig::GLOBAL_MINIMAL_CONFIG);
}
+ /**
+ * @param string $title Title of config
+ * @param int[] $moduleIds Modules to include in config
+ * @return false|ConfigTgz The module instance, false on error
+ */
public static function insert($title, $moduleIds)
{
if (!is_array($moduleIds))
@@ -287,6 +291,10 @@ class ConfigTgz
return $instance;
}
+ /**
+ * @param int $moduleId ID of config module
+ * @return ConfigTgz[]|false
+ */
public static function getAllForModule($moduleId)
{
$res = Database::simpleQuery("SELECT configid, title, filepath FROM configtgz_x_module "