Merge branch 'master' into log

Conflicts:
	core/Log.php

1 files changed, 3 insertions, 3 deletions

diff --git a/core/Profiler.php b/core/Profiler.php
index 76acd914e7..b959e3990c 100644
--- a/core/Profiler.php
+++ b/core/Profiler.php
@@ -50,7 +50,7 @@ class Profiler
      */
     public static function displayDbProfileReport()
     {
-        $profiler = \Zend_Registry::get('db')->getProfiler();
+        $profiler = Db::get()->getProfiler();
 
         if (!$profiler->getEnabled()) {
             throw new \Exception("To display the profiler you should enable enable_sql_profiler on your config/config.ini.php file");
@@ -144,7 +144,7 @@ class Profiler
      */
     public static function getDbElapsedSecs()
     {
-        $profiler = \Zend_Registry::get('db')->getProfiler();
+        $profiler = Db::get()->getProfiler();
         return $profiler->getTotalElapsedSecs();
     }
 
@@ -155,7 +155,7 @@ class Profiler
      */
     public static function getQueryCount()
     {
-        $profiler = \Zend_Registry::get('db')->getProfiler();
+        $profiler = Db::get()->getProfiler();
         return $profiler->getTotalNumQueries();
     }