Merge branch 'develop' into pr/multidomain

This commit is contained in:
Kijin Sung 2017-03-07 15:43:25 +09:00
commit fc77980c39
37 changed files with 474 additions and 300 deletions

View file

@ -17,7 +17,7 @@ class installController extends install
// Stop if already installed.
if (Context::isInstalled())
{
return new Object(-1, 'msg_already_installed');
$this->stop('msg_already_installed');
}
// Increase time limit.