diff options
| author | mattab <matthieu.aubry@gmail.com> | 2013-07-21 12:01:35 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2013-07-21 12:01:36 +0400 |
| commit | aca8ec33a85e0a70b818b6227145041717d7a69e (patch) | |
| tree | 41377e3a9737d63222522ef93ecf8483f3faddfa /core/Twig.php | |
| parent | 0a63210e3eae7562af1a3dbee340eb1ee140db3d (diff) | |
Refs #4059 Work in progress: Conversion to use Namespaces: Period*, Metrics, Segment, SegmentExpression, PluginsManager.
Removed some deprecated code.
Diffstat (limited to 'core/Twig.php')
| -rw-r--r-- | core/Twig.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/Twig.php b/core/Twig.php index 58b1e0cef1..124f018fb5 100644 --- a/core/Twig.php +++ b/core/Twig.php @@ -10,7 +10,7 @@ */ use Piwik\Piwik; use Piwik\Common; - +use Piwik\Translate; /** * Twig class @@ -108,7 +108,7 @@ class Piwik_Twig return; } $pluginTranslationsAlreadyLoaded[] = $plugins; - $jsTranslations = Piwik_Translate::getInstance()->getJavascriptTranslations($plugins); + $jsTranslations = Translate::getInstance()->getJavascriptTranslations($plugins); $jsCode = ''; if ($disableScriptTag) { $jsCode .= $jsTranslations; @@ -136,7 +136,7 @@ class Piwik_Twig private function getDefaultThemeLoader() { $themeLoader = new Twig_Loader_Filesystem(array( - sprintf("%s/plugins/%s/templates/", PIWIK_INCLUDE_PATH, PluginsManager::DEFAULT_THEME) + sprintf("%s/plugins/%s/templates/", PIWIK_INCLUDE_PATH, \Piwik\PluginsManager::DEFAULT_THEME) )); return $themeLoader; @@ -213,7 +213,7 @@ class Piwik_Twig private function addPluginNamespaces(Twig_Loader_Filesystem $loader) { - $plugins = PluginsManager::getInstance()->getLoadedPluginsName(); + $plugins = \Piwik\PluginsManager::getInstance()->getLoadedPluginsName(); foreach($plugins as $name) { $name = Common::unprefixClass($name); $path = sprintf("%s/plugins/%s/templates/", PIWIK_INCLUDE_PATH, $name); |