diff options
| author | mattab <matthieu.aubry@gmail.com> | 2014-04-05 08:43:55 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2014-04-05 08:43:55 +0400 |
| commit | 6c6ddc34bfcf82a333ce4b11e7c19e6f2b8da14c (patch) | |
| tree | 784e87c2af7b53b5abc1e056650b9580ffae6cd0 /plugins | |
| parent | 46bd3067a0298ffe528aaedbc6b141bf4480f8c1 (diff) | |
Skip test on php 5.3
Trying to fix: PHP Fatal error: Call to a member function getCurrency() on a non-object in /home/travis/build/piwik/piwik/plugins/Live/API.php on line 554
https://travis-ci.org/piwik/piwik/jobs/22318726
Note: this should not happen really and I'm puzzled... especially as it works on other PHP versions...
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/Live/API.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/plugins/Live/API.php b/plugins/Live/API.php index f9629591aa..15d3c3e78e 100644 --- a/plugins/Live/API.php +++ b/plugins/Live/API.php @@ -551,10 +551,8 @@ class API extends \Piwik\Plugin\API $visitor = new Visitor($visitorDetailsArray); $visitorDetailsArray = $visitor->getAllVisitorDetails(); - if(is_object($website)) { // PHP 5.3 fail on travis - $visitorDetailsArray['siteCurrency'] = $website->getCurrency(); - $visitorDetailsArray['siteCurrencySymbol'] = @$currencies[$visitorDetailsArray['siteCurrency']]; - } + $visitorDetailsArray['siteCurrency'] = $website->getCurrency(); + $visitorDetailsArray['siteCurrencySymbol'] = @$currencies[$visitorDetailsArray['siteCurrency']]; $visitorDetailsArray['serverTimestamp'] = $visitorDetailsArray['lastActionTimestamp']; $dateTimeVisit = Date::factory($visitorDetailsArray['lastActionTimestamp'], $timezone); $visitorDetailsArray['serverTimePretty'] = $dateTimeVisit->getLocalized('%time%'); |