Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Napoli <matthieu@mnapoli.fr>2014-10-15 06:52:40 +0400
committerMatthieu Napoli <matthieu@mnapoli.fr>2014-10-16 01:07:24 +0400
commitd9562a6b654d0a7d615671be0e9450b10e0806b5 (patch)
tree1d5bf04aa935c4727ab78e8137a3127771b3e8de /plugins/Installation/Controller.php
parent03bad4b2e7954d52d9f4376a965f212bd8774e66 (diff)
Extracted `Piwik::getJavascriptCode()` into a separate, non static class: `Piwik\Tracker\TrackerCodeGenerator`
`Piwik::getJavascriptCode()` is now deprecated in favor of the new class.
Diffstat (limited to 'plugins/Installation/Controller.php')
-rw-r--r--plugins/Installation/Controller.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index 574af47ad7..0dffcd343c 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -29,6 +29,7 @@ use Piwik\Plugins\UserCountry\LocationProvider;
use Piwik\Plugins\UsersManager\API as APIUsersManager;
use Piwik\ProxyHeaders;
use Piwik\SettingsPiwik;
+use Piwik\Tracker\TrackerCodeGenerator;
use Piwik\Updater;
use Piwik\Url;
use Piwik\Version;
@@ -375,7 +376,8 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
// Load the Tracking code and help text from the SitesManager
$viewTrackingHelp = new \Piwik\View('@SitesManager/_displayJavascriptCode');
$viewTrackingHelp->displaySiteName = $siteName;
- $viewTrackingHelp->jsTag = Piwik::getJavascriptCode($idSite, Url::getCurrentUrlWithoutFileName());
+ $javascriptGenerator = new TrackerCodeGenerator();
+ $viewTrackingHelp->jsTag = $javascriptGenerator->generate($idSite, Url::getCurrentUrlWithoutFileName());
$viewTrackingHelp->idSite = $idSite;
$viewTrackingHelp->piwikUrl = Url::getCurrentUrlWithoutFileName();