Merge pull request #1044 from uniun/3.0

BUG Hardcoded project name in include_by_locale()
This commit is contained in:
Ingo Schommer 2013-01-11 06:46:20 -08:00
commit e66408b0a7

View File

@ -1962,7 +1962,7 @@ class i18n extends Object implements TemplateGlobalProvider {
// Sort modules by inclusion priority, then alphabetically
// TODO Should be handled by priority flags within modules
$prios = array('sapphire' => 10, 'framework' => 10, 'admin' => 11, 'cms' => 12, 'mysite' => 90);
$prios = array('sapphire' => 10, 'framework' => 10, 'admin' => 11, 'cms' => 12, project() => 90);
$modules = SS_ClassLoader::instance()->getManifest()->getModules();
ksort($modules);
uksort(