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:
authorbenakamoorthi <benaka.moorthi@gmail.com>2012-10-08 01:15:40 +0400
committerbenakamoorthi <benaka.moorthi@gmail.com>2012-10-08 01:15:40 +0400
commitb2e1f41db099865d7dbea4606f824c1ac99b26a1 (patch)
treeea622a9c64f6f5c2512a54415f6d981a0c763f26 /tests/LocalTracker.php
parent6a10ea4aaf72e6b23ad1728bf2ba77bbd4e18dd1 (diff)
Refs #1823, modified UserCountry plugin to allow use of GeoIP databases if desired. Added two reports, getVisitsByRegion + getVisitsByCity.
Notes: * Supports country, region, city, org & isp GeoIP databases. * Supports GeoIP PHP API, PECL module & server modules. * Added ability to regenerate 'general' tracker cache. * Removed location_continent column from log_visit & log_conversion tables, and removed visits by continent blob record. Report is now a view over country report. git-svn-id: http://dev.piwik.org/svn/trunk@7122 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'tests/LocalTracker.php')
-rwxr-xr-xtests/LocalTracker.php10
1 files changed, 3 insertions, 7 deletions
diff --git a/tests/LocalTracker.php b/tests/LocalTracker.php
index b3a36954d0..21fbc2ffae 100755
--- a/tests/LocalTracker.php
+++ b/tests/LocalTracker.php
@@ -64,11 +64,11 @@ class Piwik_LocalTracker extends PiwikTracker
Piwik_Tracker::setTestEnvironment($testEnvironmentArgs, $method);
// set language
- $oldLang = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
+ $oldLang = isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : '';
$_SERVER['HTTP_ACCEPT_LANGUAGE'] = $this->acceptLanguage;
// set user agent
- $oldUserAgent = $_SERVER['HTTP_USER_AGENT'];
+ $oldUserAgent = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '';
$_SERVER['HTTP_USER_AGENT'] = $this->userAgent;
// set cookie
@@ -79,11 +79,7 @@ class Piwik_LocalTracker extends PiwikTracker
ob_start();
$localTracker = new Piwik_Tracker();
- try {
- $localTracker->main($requests);
- } catch(Exception $e) {
- echo "Error:" . $e->getMessage();
- }
+ $localTracker->main($requests);
$output = ob_get_contents();