diff options
| author | Simon Rettberg | 2014-06-11 14:31:09 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2014-06-11 14:31:09 +0200 |
| commit | 62d6349c790076ec26edd6e10d617b2f4c385e8b (patch) | |
| tree | b2884200b75b34994ddfcfef06bff3d127427e73 /inc | |
| parent | Reboot functionality on system status page (diff) | |
| download | slx-admin-62d6349c790076ec26edd6e10d617b2f4c385e8b.tar.gz slx-admin-62d6349c790076ec26edd6e10d617b2f4c385e8b.tar.xz slx-admin-62d6349c790076ec26edd6e10d617b2f4c385e8b.zip | |
Minor bug fixes and removal of dead code
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/render.inc.php | 2 | ||||
| -rw-r--r-- | inc/trigger.inc.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/inc/render.inc.php b/inc/render.inc.php index 2d69c322..802944f4 100644 --- a/inc/render.inc.php +++ b/inc/render.inc.php @@ -164,7 +164,7 @@ class Render */ public static function parse($template, $params = false) { - if (is_array($params) || $params === false) + if (is_array($params) || $params === false || is_null($params)) $params['token'] = Session::get('token'); return self::$mustache->render(self::getTemplate($template), $params); } diff --git a/inc/trigger.inc.php b/inc/trigger.inc.php index f483bfc0..2fde45ab 100644 --- a/inc/trigger.inc.php +++ b/inc/trigger.inc.php @@ -70,7 +70,7 @@ class Trigger $storetype = $vmstore['storetype']; if ($storetype === 'nfs') $addr = $vmstore['nfsaddr']; if ($storetype === 'cifs') $addr = $vmstore['cifsaddr']; - if ($storetype === 'internal') $addr = 'none'; + if ($storetype === 'internal') $addr = 'null'; return Taskmanager::submit('MountVmStore', array( 'address' => $addr, 'type' => 'images', |