update Piwik to version 2.16 (fixes #91)

This commit is contained in:
oliver 2016-04-10 18:55:57 +02:00
commit d885a4baa9
5833 changed files with 418860 additions and 226988 deletions

View file

@ -1,6 +1,6 @@
<?php
/**
* Piwik - Open source web analytics
* Piwik - free/libre analytics platform
*
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@ -26,10 +26,10 @@ class Cloud extends Visualization
{
const ID = 'cloud';
const TEMPLATE_FILE = "@CoreVisualizations/_dataTableViz_tagCloud.twig";
const FOOTER_ICON = 'plugins/Zeitgeist/images/tagcloud.png';
const FOOTER_ICON = 'plugins/Morpheus/images/tagcloud.png';
const FOOTER_ICON_TITLE = 'General_TagCloud';
/** Used by integration tests to make sure output is consistent. */
/** Used by system tests to make sure output is consistent. */
public static $debugDisableShuffle = false;
public $truncatingLimit = 50;
@ -143,7 +143,7 @@ class Cloud extends Visualization
$tmpArray = $this->wordsArray;
$this->wordsArray = array();
foreach ($keys as $key => $value) {
foreach ($keys as $value) {
$this->wordsArray[$value] = $tmpArray[$value];
}
@ -174,6 +174,8 @@ class Cloud extends Visualization
*/
private function truncateWordIfNeeded($word)
{
$word = Common::unsanitizeInputValue($word);
if (Common::mb_strlen($word) > $this->truncatingLimit) {
return Common::mb_substr($word, 0, $this->truncatingLimit - 3) . '...';
}