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:
authormattpiwik <matthieu.aubry@gmail.com>2012-10-15 18:44:49 +0400
committermattpiwik <matthieu.aubry@gmail.com>2012-10-15 18:44:49 +0400
commit335a0b40b6214fea8e1dd9e1e81e998ebda1ec01 (patch)
tree914a72e19793bc71ba408481d4ded3aa871fad70 /plugins/UserCountry
parent1a59c2f524931fffe8c0dacfea41d145deaea6d3 (diff)
Minor text change & provider ordering Refs #1823
git-svn-id: http://dev.piwik.org/svn/trunk@7204 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'plugins/UserCountry')
-rw-r--r--plugins/UserCountry/Controller.php2
-rwxr-xr-xplugins/UserCountry/LocationProvider/GeoIp/Pecl.php2
-rwxr-xr-xplugins/UserCountry/LocationProvider/GeoIp/Php.php2
-rwxr-xr-xplugins/UserCountry/LocationProvider/GeoIp/ServerBased.php2
4 files changed, 4 insertions, 4 deletions
diff --git a/plugins/UserCountry/Controller.php b/plugins/UserCountry/Controller.php
index 48edf956cd..be24a4ff6d 100644
--- a/plugins/UserCountry/Controller.php
+++ b/plugins/UserCountry/Controller.php
@@ -52,7 +52,7 @@ class Piwik_UserCountry_Controller extends Piwik_Controller
break;
}
}
-
+$view->isThereWorkingProvider=FALSE;
$this->setBasicVariablesView($view);
Piwik_Controller_Admin::setBasicVariablesAdminView($view);
$view->menu = Piwik_GetAdminMenu();
diff --git a/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php b/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php
index c5c61118af..48fe0c1a50 100755
--- a/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php
+++ b/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php
@@ -240,7 +240,7 @@ class Piwik_UserCountry_LocationProvider_GeoIp_Pecl extends Piwik_UserCountry_Lo
'title' => self::TITLE,
'description' => $desc,
'install_docs' => $installDocs,
- 'order' => 2);
+ 'order' => 3);
}
/**
diff --git a/plugins/UserCountry/LocationProvider/GeoIp/Php.php b/plugins/UserCountry/LocationProvider/GeoIp/Php.php
index 07b36a3f63..6ccccb55bc 100755
--- a/plugins/UserCountry/LocationProvider/GeoIp/Php.php
+++ b/plugins/UserCountry/LocationProvider/GeoIp/Php.php
@@ -240,7 +240,7 @@ class Piwik_UserCountry_LocationProvider_GeoIp_Php extends Piwik_UserCountry_Loc
'title' => self::TITLE,
'description' => $desc,
'install_docs' => $installDocs,
- 'order' => 4);
+ 'order' => 2);
}
/**
diff --git a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php
index 0e67a1ce17..40c2226382 100755
--- a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php
+++ b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php
@@ -207,7 +207,7 @@ class Piwik_UserCountry_LocationProvider_GeoIp_ServerBased extends Piwik_UserCou
return array('id' => self::ID,
'title' => $title,
'description' => $desc,
- 'order' => 3,
+ 'order' => 4,
'install_docs' => $installDocs);
}
}