diff options
| author | Simon Rettberg | 2017-12-01 13:42:04 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2017-12-01 13:42:04 +0100 |
| commit | 5393703f6e1485ddff94a50f63bcdd216ab629f4 (patch) | |
| tree | ce2db7130302bd4fb78b170e1fbd75496a1b4510 /inc/render.inc.php | |
| parent | Merge remote-tracking branch 'origin/permission-manager' into permission-manager (diff) | |
| parent | [roomplanner] Sort already placed machines to the bottom (diff) | |
| download | slx-admin-5393703f6e1485ddff94a50f63bcdd216ab629f4.tar.gz slx-admin-5393703f6e1485ddff94a50f63bcdd216ab629f4.tar.xz slx-admin-5393703f6e1485ddff94a50f63bcdd216ab629f4.zip | |
Merge branch 'master' into permission-manager
Diffstat (limited to 'inc/render.inc.php')
| -rw-r--r-- | inc/render.inc.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/inc/render.inc.php b/inc/render.inc.php index 53e2f314..13262c1d 100644 --- a/inc/render.inc.php +++ b/inc/render.inc.php @@ -107,8 +107,7 @@ class Render <script src="script/jquery.js"></script> <script src="script/bootstrap.min.js"></script> <script src="script/taskmanager.js"></script> - <script src="script/fileselect.js"></script> - <script src="script/collapse.js"></script> + <script src="script/slx-fixes.js"></script> '; foreach ($modules as $module) { $files = $module->getScripts($module != $pageModule); @@ -213,7 +212,7 @@ class Render */ public static function parse($template, $params = false, $module = false) { - if ($module === false) { + if ($module === false && class_exists('Page')) { $module = Page::getModule()->getIdentifier(); } // Load html snippet |