refs #4134 renamed some more hooks and removed some not used and not needed hooks

6 files changed, 7 insertions, 22 deletions

diff --git a/core/Common.php b/core/Common.php
index fa5b401510..622dc9df40 100644
--- a/core/Common.php
+++ b/core/Common.php
@@ -770,12 +770,6 @@ class Common
      */
     public static function getCountry($lang, $enableLanguageToCountryGuess, $ip)
     {
-        $country = null;
-        Piwik_PostEvent('Request.getCountry', array(&$country, $ip));
-        if (!empty($country)) {
-            return strtolower($country);
-        }
-
         if (empty($lang) || strlen($lang) < 2 || $lang == 'xx') {
             return 'xx';
         }
diff --git a/core/Controller.php b/core/Controller.php
index 0e01851eee..7e04c46e47 100644
--- a/core/Controller.php
+++ b/core/Controller.php
@@ -634,8 +634,6 @@ abstract class Controller
             $defaultWebsiteId = $defaultReport;
         }
 
-        Piwik_PostEvent('User.getDefaultWebsiteId', array(&$defaultWebsiteId));
-
         if ($defaultWebsiteId) {
             return $defaultWebsiteId;
         }
diff --git a/core/Menu/Admin.php b/core/Menu/Admin.php
index ef89c42c4f..c706d8c8b6 100644
--- a/core/Menu/Admin.php
+++ b/core/Menu/Admin.php
@@ -32,14 +32,14 @@ class Admin extends MenuAbstract
     }
 
     /**
-     * Triggers the AdminMenu.addMenuEntries hook and returns the menu.
+     * Triggers the Menu.Admin.addItems hook and returns the menu.
      *
      * @return Array
      */
     public function get()
     {
         if (!$this->menu) {
-            Piwik_PostEvent('AdminMenu.addMenuEntries');
+            Piwik_PostEvent('Menu.Admin.addItems');
         }
         return parent::get();
     }
diff --git a/core/Menu/Main.php b/core/Menu/Main.php
index fbaaf55337..8732400975 100644
--- a/core/Menu/Main.php
+++ b/core/Menu/Main.php
@@ -51,7 +51,7 @@ class Main extends MenuAbstract
     }
 
     /**
-     * Triggers the Menu.addMenuEntries hook and returns the menu.
+     * Triggers the Menu.Reporting.addItems hook and returns the menu.
      *
      * @return Array
      */
@@ -59,7 +59,7 @@ class Main extends MenuAbstract
     {
         // We trigger the Event only once!
         if (!$this->menu) {
-            Piwik_PostEvent('Menu.addMenuEntries');
+            Piwik_PostEvent('Menu.Reporting.addItems');
         }
         return parent::get();
     }
diff --git a/core/Menu/Top.php b/core/Menu/Top.php
index c4e70ca1bd..31c8fbb86a 100644
--- a/core/Menu/Top.php
+++ b/core/Menu/Top.php
@@ -52,14 +52,14 @@ class Top extends MenuAbstract
     }
 
     /**
-     * Triggers the TopMenu.addMenuEntries hook and returns the menu.
+     * Triggers the Menu.Top.addItems hook and returns the menu.
      *
      * @return Array
      */
     public function get()
     {
         if (!$this->menu) {
-            Piwik_PostEvent('TopMenu.addMenuEntries');
+            Piwik_PostEvent('Menu.Top.addItems');
         }
         return parent::get();
     }
diff --git a/core/Tracker/Visit.php b/core/Tracker/Visit.php
index f40e346298..85388222a8 100644
--- a/core/Tracker/Visit.php
+++ b/core/Tracker/Visit.php
@@ -909,14 +909,7 @@ class Visit implements Tracker\VisitInterface
      */
     protected function newAction()
     {
-        $action = null;
-        Piwik_PostEvent('Tracker.createNewAction', array(&$action));
-
-        if (is_null($action)) {
-            $action = new Action($this->request);
-        } elseif (!($action instanceof ActionInterface)) {
-            throw new Exception("The Action object set in the plugin must implement the interface ActionInterface");
-        }
+        $action = new Action($this->request);
         return $action;
     }