Refs #3741 Resuming PHP Namespaces conversion of Piwik core, mostly finished core/ conversion

2 files changed, 5 insertions, 4 deletions

diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index f661b3dd98..aa3052e6b5 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -17,11 +17,12 @@ use Piwik\Config;
 use Piwik\Common;
 use Piwik\Access;
 use Piwik\Http;
-use Piwik\Piwik_Updater;
+use Piwik\Updater;
 use Piwik\View;
 use Piwik\Version;
 use Piwik\Url;
 use Piwik\ProxyHeaders;
+use Piwik\Db;
 
 /**
  * Installation controller
@@ -213,7 +214,7 @@ class Piwik_Installation_Controller extends Admin
         }
 
         $this->createDbFromSessionInformation();
-        $db = Zend_Registry::get('db');
+        $db = \Zend_Registry::get('db');
 
         try {
             $db->checkClientVersion();
@@ -294,7 +295,7 @@ class Piwik_Installation_Controller extends Admin
             Piwik::createTables();
             Piwik::createAnonymousUser();
 
-            $updater = new Piwik_Updater();
+            $updater = new Updater();
             $updater->recordComponentSuccessfullyUpdated('core', Version::VERSION);
             $view->tablesCreated = true;
             $view->showNextStep = true;
diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php
index 8939ace24e..f4d1f99247 100644
--- a/plugins/Installation/FormDatabaseSetup.php
+++ b/plugins/Installation/FormDatabaseSetup.php
@@ -172,7 +172,7 @@ class Piwik_Installation_FormDatabaseSetup_Rule_checkUserPrivileges extends HTML
             }
         }
 
-        $db = Zend_Registry::get('db');
+        $db = \Zend_Registry::get('db');
 
         try {
             // try to drop tables before running privilege tests