diff options
| author | Christian Klinger | 2016-06-15 16:43:17 +0200 |
|---|---|---|
| committer | Christian Klinger | 2016-06-15 16:43:17 +0200 |
| commit | 2b18d0d0c49c3a75bd221ab86b7315f7bae98008 (patch) | |
| tree | 7d44e103224c1a79e8ccdd5d0313f76180847303 /inc/dictionary.inc.php | |
| parent | small style changes (diff) | |
| parent | [sysconfignew] Move css from global file to module specific one (diff) | |
| download | slx-admin-2b18d0d0c49c3a75bd221ab86b7315f7bae98008.tar.gz slx-admin-2b18d0d0c49c3a75bd221ab86b7315f7bae98008.tar.xz slx-admin-2b18d0d0c49c3a75bd221ab86b7315f7bae98008.zip | |
Merge branch 'modularization' of git.openslx.org:openslx-ng/slx-admin into modularization
Conflicts:
install/content.sql
install/schema.sql
Diffstat (limited to 'inc/dictionary.inc.php')
| -rw-r--r-- | inc/dictionary.inc.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/inc/dictionary.inc.php b/inc/dictionary.inc.php index 6ae8fb9b..01651b88 100644 --- a/inc/dictionary.inc.php +++ b/inc/dictionary.inc.php @@ -79,7 +79,8 @@ class Dictionary public static function translateFile($path, $tag) { - // TODO: Handle case where we have no active module/no page class + if (!class_exists('Page') || Page::getModule() === false) + return false; // We have no page - return false for now, as we're most likely running in api or install mode return self::translateFileModule(Page::getModule()->getIdentifier(), $path, $tag); } |