diff options
| author | diosmosis <benakamoorthi@fastmail.fm> | 2014-04-03 03:54:06 +0400 |
|---|---|---|
| committer | diosmosis <benakamoorthi@fastmail.fm> | 2014-04-03 03:54:44 +0400 |
| commit | 9f687ad2eaea1c02b087175b12c3946ee4694c60 (patch) | |
| tree | 32faa400ad347d5fb43f578c9685186f3ac275b0 /core | |
| parent | 98bc277a08af76e7f498b37b13dada76be727e8f (diff) | |
Remove stray newlines in javascript tracking code output, use server side tracking code generation for JS code & for image tracking code, add new SitesManager.getImageTrackingCode API method for server side image tracking code generation, and fix bug where goals for initially selected site in image tracking code generator were not loaded.
Diffstat (limited to 'core')
| -rw-r--r-- | core/Piwik.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/core/Piwik.php b/core/Piwik.php index 54d7e54375..a0cff3cdc2 100644 --- a/core/Piwik.php +++ b/core/Piwik.php @@ -186,16 +186,16 @@ class Piwik * this event to customise the JavaScript tracking code that is displayed to the * user. * - * @param array $codeImpl An array containing snippets of code that the event handler - * can modify. Will contain the following elements: + * @param array &$codeImpl An array containing snippets of code that the event handler + * can modify. Will contain the following elements: * - * - **idSite**: The ID of the site being tracked. - * - **piwikUrl**: The tracker URL to use. - * - **options**: A string of JavaScript code that customises - * the JavaScript tracker. + * - **idSite**: The ID of the site being tracked. + * - **piwikUrl**: The tracker URL to use. + * - **options**: A string of JavaScript code that customises + * the JavaScript tracker. * - * The **httpsPiwikUrl** element can be set if the HTTPS - * domain is different from the normal domain. + * The **httpsPiwikUrl** element can be set if the HTTPS + * domain is different from the normal domain. * @param array $parameters The parameters supplied to the `Piwik::getJavascriptCode()`. */ self::postEvent('Piwik.getJavascriptCode', array(&$codeImpl, $parameters)); @@ -889,7 +889,7 @@ class Piwik } $options = ''; if ($mergeSubdomains && !empty($websiteHosts)) { - $options .= PHP_EOL . ' _paq.push(["setCookieDomain", "*.' . $websiteHosts[0] . '"]);' . PHP_EOL; + $options .= ' _paq.push(["setCookieDomain", "*.' . $websiteHosts[0] . '"]);' . PHP_EOL; } if ($mergeAliasUrls && !empty($websiteHosts)) { $urls = '["*.' . implode('","*.', $websiteHosts) . '"]'; |