Merge branch 'plugin_namespaces'

Conflicts:
	plugins/UserCountryMap/Controller.php

1 files changed, 7 insertions, 5 deletions

diff --git a/plugins/Provider/functions.php b/plugins/Provider/functions.php
index 540060db4b..51a85e15d1 100644
--- a/plugins/Provider/functions.php
+++ b/plugins/Provider/functions.php
@@ -6,8 +6,10 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  * @category Piwik_Plugins
- * @package Piwik_Provider
+ * @package Provider
  */
+namespace Piwik\Plugins\Provider;
+
 use Piwik\Common;
 use Piwik\DataTable;
 
@@ -17,7 +19,7 @@ use Piwik\DataTable;
  * @param string $in
  * @return string Host name, IP (if IP address didn't resolve), or Unknown
  */
-function Piwik_getHostnameName($in)
+function getHostnameName($in)
 {
     if (empty($in)) {
         return Piwik_Translate('General_Unknown');
@@ -37,7 +39,7 @@ function Piwik_getHostnameName($in)
  * @param string $in hostname
  * @return string URL
  */
-function Piwik_getHostnameUrl($in)
+function getHostnameUrl($in)
 {
     if ($in == DataTable::LABEL_SUMMARY_ROW) {
         return false;
@@ -63,9 +65,9 @@ function Piwik_getHostnameUrl($in)
  * @param string $in hostname
  * @return string Real ISP name, IP (if IP address didn't resolve), or Unknown
  */
-function Piwik_Provider_getPrettyProviderName( $in )
+function getPrettyProviderName( $in )
 {
-    $providerName = Piwik_getHostnameName($in);
+    $providerName = getHostnameName($in);
 
     $prettyNames = Common::getProviderNames();