xoops-svn

[<tr...@us...>]

Revision: 10350
          http://sourceforge.net/p/xoops/svn/10350
Author:   trabis
Date:     2012-12-10 19:39:25 +0000 (Mon, 10 Dec 2012)
Log Message:
-----------
Logger is creating a db connection before protector module could hook it. This was causing infinite loop.

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/logger/plugins/legacy/logger.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/logger/plugins/legacy/logger.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/logger/plugins/legacy/logger.php	2012-12-10 14:09:17 UTC (rev 10349)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/logger/plugins/legacy/logger.php	2012-12-10 19:39:25 UTC (rev 10350)
@@ -52,8 +52,10 @@
     {
         error_reporting(E_ALL | E_STRICT);
         $xoops = Xoops::getInstance();
-        if ($xoops->getModuleConfig('debug_mode', 'logger') == 2) {
-            $this->usePopup = true;
+        if (class_exists('XoopsDatabase', false)) {
+            if ($xoops->getModuleConfig('debug_mode', 'logger') == 2) {
+                $this->usePopup = true;
+            }
         }
         $this->activated = true;
         $this->enableRendering();
@@ -115,7 +117,9 @@
     public function addQuery($sql, $error = null, $errno = null, $query_time = null)
     {
         if ($this->activated) {
-            $this->queries[] = array('sql' => $sql, 'error' => $error, 'errno' => $errno, 'query_time' => $query_time);
+            $this->queries[] = array(
+                'sql' => $sql, 'error' => $error, 'errno' => $errno, 'query_time' => $query_time
+            );
         }
     }