[xoops-svn] SF.net SVN: xoops-svn:[11966] XoopsCore/branches/2.6.x/2.6.0_doctrine/ htdocs/modules/logger/plugins

[<rgr...@us...>]

Revision: 11966
          http://sourceforge.net/p/xoops/svn/11966
Author:   rgriffith
Date:     2013-08-23 00:10:44 +0000 (Fri, 23 Aug 2013)
Log Message:
-----------
Fix for legacy DB support

Not seeing $GLOBALS['xoopsDB'] for some reason, and wants prefix for database message processing. Substituting XOOPS_DB_PREFIX constant for now.

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

Modified: XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/modules/logger/plugins/firephp/logger.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/modules/logger/plugins/firephp/logger.php	2013-08-22 23:04:58 UTC (rev 11965)
+++ XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/modules/logger/plugins/firephp/logger.php	2013-08-23 00:10:44 UTC (rev 11966)
@@ -78,7 +78,7 @@
 
         $fbqueries = array();
         $fbquerieserr = array();
-        $pattern = '/b' . preg_quote($xoopsDB->prefix()) . '_/i';
+        $pattern = '/b' . preg_quote(XOOPS_DB_PREFIX) . '_/i';
         $errcount = 1;
 
         foreach ($this->queries as $q) {

Modified: XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/modules/logger/plugins/legacy/render.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/modules/logger/plugins/legacy/render.php	2013-08-22 23:04:58 UTC (rev 11965)
+++ XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/modules/logger/plugins/legacy/render.php	2013-08-23 00:10:44 UTC (rev 11966)
@@ -130,10 +130,8 @@
 
 if (empty($mode) || $mode == 'queries') {
     $class = 'even';
-    global $xoopsDB;
-    $db = $xoopsDB;
     $ret .= '<table id="xo-logger-queries" class="outer"><thead><tr><th>' . _MD_LOGGER_QUERIES . '</th></tr></thead><tbody>';
-    $pattern = '/\b' . preg_quote($db->prefix()) . '\_/i';
+    $pattern = '/\b' . preg_quote(XOOPS_DB_PREFIX) . '\_/i';
 
     foreach ($this->queries as $q) {
         $sql = preg_replace($pattern, '', $q['sql']);