Merge remote-tracking branch 'origin/feature/HOR-3559' into feature/HOR-3629

This commit is contained in:
Ronald Quenta
2017-08-10 18:33:14 -04:00
68 changed files with 818 additions and 760 deletions

View File

@@ -475,7 +475,6 @@ class workspaceTools
foreach ($information as $key => $value) {
$arrayLang[] = trim($value['LOCALE']);
}
//require_once ('classes/model/Content.php');
$regenerateContent = new Content();
$regenerateContent->regenerateContent($arrayLang, $workSpace);
}
@@ -670,7 +669,6 @@ class workspaceTools
{
$this->initPropel(true);
//require_once ('classes/model/AppCacheView.php');
//check the language, if no info in config about language, the default is 'en'
$oConf = new Configurations();