Continued with rewrites:

[core.git] / framework / main / classes / language / class_LanguageSystem.php

diff --git a/framework/main/classes/language/class_LanguageSystem.php b/framework/main/classes/language/class_LanguageSystem.php
index 0c2875ac2c9740666d07ecdb437f151d01be50f0..6e775009ab3c94f6e41fdc3f8a339e00d55d511e 100644 (file)
--- a/framework/main/classes/language/class_LanguageSystem.php
+++ b/framework/main/classes/language/class_LanguageSystem.php
@@ -85,10 +85,9 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
                        $applicationInstance = Registry::getRegistry()->getInstance('app');
 
                        // 2) Try to build it
-                       $languageBasePath = sprintf('%sapplication/%s/language/',
-                               $langInstance->getConfigInstance()->getConfigEntry('base_path'),
-                               // Don't allow any underscores/dashes in application names
-                               str_replace(array('_', '-'), array('', ''), $applicationInstance->getAppShortName())
+                       $languageBasePath = sprintf('%s%s/language/',
+                               $langInstance->getConfigInstance()->getConfigEntry('application_base_path'),
+                               $applicationInstance->getAppShortName()
                        );
                } // END - if