Merge branch 'develop' into pr/loadfile-improvements

This commit is contained in:
Kijin Sung 2016-05-05 15:42:08 +09:00
commit d5caa823a2
8 changed files with 31 additions and 13 deletions

View file

@ -417,7 +417,7 @@ class adminAdminView extends admin
$oModuleModel = getModel('module');
$config = $oModuleModel->getModuleConfig('module');
Context::set('site_title', escape($config->siteTitle));
Context::set('html_footer', escape($config->htmlFooter));
Context::set('all_html_footer', escape($config->htmlFooter));
// Index module
$columnList = array('modules.mid', 'modules.browser_title', 'sites.index_module_srl');