Merge branch 'offical/develop' into pr/document-trash

This commit is contained in:
BJRambo 2016-05-15 15:31:33 +09:00
commit c8da469758
37 changed files with 329 additions and 487 deletions

View file

@ -200,8 +200,8 @@ class boardAdminView extends board {
// get the addtional setup trigger
// the additional setup triggers can be used in many modules
$output = ModuleHandler::triggerCall('module.dispAdditionSetup', 'before', $content);
$output = ModuleHandler::triggerCall('module.dispAdditionSetup', 'after', $content);
ModuleHandler::triggerCall('module.dispAdditionSetup', 'before', $content);
ModuleHandler::triggerCall('module.dispAdditionSetup', 'after', $content);
Context::set('setup_content', $content);
// setup the template file