From 335a0b40b6214fea8e1dd9e1e81e998ebda1ec01 Mon Sep 17 00:00:00 2001
From: mattpiwik <matthieu.aubry@gmail.com>
Date: Mon, 15 Oct 2012 14:44:49 +0000
Subject: Minor text change & provider ordering Refs #1823

git-svn-id: http://dev.piwik.org/svn/trunk@7204 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
 plugins/UserCountry/Controller.php                         | 2 +-
 plugins/UserCountry/LocationProvider/GeoIp/Pecl.php        | 2 +-
 plugins/UserCountry/LocationProvider/GeoIp/Php.php         | 2 +-
 plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'plugins/UserCountry')

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);
 	}
 }
-- 
cgit v1.2.3