diff options
| author | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-10-20 03:14:28 +0400 |
|---|---|---|
| committer | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-10-20 03:14:28 +0400 |
| commit | 3fb3cd08da0110b6fc94088f3fa44a4587347a23 (patch) | |
| tree | 22dc0a6e0bfaeb27a1fa413906267235d33a546a /core | |
| parent | 70adbfc090095e8ed80a6a0f1dcc9623d4cc1127 (diff) | |
| parent | de8e60b4432b6dfc91f5a5d68dd1d7a72e07484a (diff) | |
Merge branch 'master' into bugfix/6156
Diffstat (limited to 'core')
| -rw-r--r-- | core/DataFiles/SearchEngines.php | 16 | ||||
| -rw-r--r-- | core/DataTable/Filter/PivotByDimension.php | 16 |
2 files changed, 22 insertions, 10 deletions
diff --git a/core/DataFiles/SearchEngines.php b/core/DataFiles/SearchEngines.php index 0c34df0bb8..243c6c5be1 100644 --- a/core/DataFiles/SearchEngines.php +++ b/core/DataFiles/SearchEngines.php @@ -188,6 +188,7 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) { 'avira-int.ask.com' => array('Ask'), 'searchqu.com' => array('Ask'), 'search.tb.ask.com' => array('Ask'), + 'nortonsafe.search.ask.com' => array('Ask'), // Atlas 'searchatlas.centrum.cz' => array('Atlas', 'q', '?q={k}'), @@ -351,6 +352,9 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) { // Francite 'recherche.francite.com' => array('Francite', 'name'), + // Findhurtig + 'www.findhurtig.dk' => array('Findhurtig', 'q', 'web?q={k}'), + // Fireball 'www.fireball.de' => array('Fireball', 'q', 'ajax.asp?q={k}'), @@ -385,6 +389,9 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) { // GAIS 'gais.cs.ccu.edu.tw' => array('GAIS', 'q', 'search.php?q={k}'), + // Genieo + 'search.genieo.com' => array('Genieo', 'q', '&q={k}'), + // Geona 'geona.net' => array('Geona', 'q', 'search?q={k}'), @@ -1049,9 +1056,14 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) { // Zapmeta 'www.zapmeta.com' => array('Zapmeta', array('q', 'query'), '?q={k}'), - 'www.zapmeta.nl' => array('Zapmeta'), - 'www.zapmeta.de' => array('Zapmeta'), + 'zapmeta.{}' => array('Zapmeta'), 'uk.zapmeta.com' => array('Zapmeta'), + 'ar.zapmeta.com' => array('Zapmeta'), + 'au.zapmeta.com' => array('Zapmeta'), + 'ca.zapmeta.com' => array('Zapmeta'), + 'fi.zapmeta.com' => array('Zapmeta'), + 'no.zapmeta.com' => array('Zapmeta'), + 'tr.zapmeta.com' => array('Zapmeta'), // Zoek 'www3.zoek.nl' => array('Zoek', 'q'), diff --git a/core/DataTable/Filter/PivotByDimension.php b/core/DataTable/Filter/PivotByDimension.php index 23d40990f8..bc5c6cca46 100644 --- a/core/DataTable/Filter/PivotByDimension.php +++ b/core/DataTable/Filter/PivotByDimension.php @@ -448,12 +448,6 @@ class PivotByDimension extends BaseFilter $columnSet[$othersRowLabel] = 0; } - // make sure column names are utf8 encoded - if (!empty($columnSet)) { - $utfKeys = array_map('utf8_encode', array_keys($columnSet)); - $columnSet = array_combine($utfKeys, array_values($columnSet)); - } - // remove column sums from array so it can be used as a default row $columnSet = array_map(function () { return false; }, $columnSet); @@ -465,8 +459,14 @@ class PivotByDimension extends BaseFilter private function getOrderedColumnsWithPrependedNumerals($defaultRow, $othersRowLabel) { - $nbsp = html_entity_decode(' '); // must use decoded character otherwise sort later will fail - // (sort column will be set to decoded but columns will have ) + $flags = ENT_COMPAT; + if (defined('ENT_HTML401')) { + $flags |= ENT_HTML401; // part of default flags for 5.4, but not 5.3 + } + + // must use decoded character otherwise sort later will fail + // (sort column will be set to decoded but columns will have ) + $nbsp = html_entity_decode(' ', $flags, 'utf-8'); $result = array(); |