mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 05:37:32 +02:00
Code Issues Releases Wiki Activity

McFly's mysql enhancements + multilang fix.

Browse Source
This commit is contained in:
CaMer0n
2007-06-15 08:04:07 +00:00
parent db8b0706d1
commit 4dbb2522ea
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
e107_handlers/mysql_class.php
View File

@@ -12,9 +12,9 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_handlers/mysql_class.php,v $ | $Source: /cvs_backup/e107_0.8/e107_handlers/mysql_class.php,v $
| $Revision: 1.13 $ | $Revision: 1.14 $
| $Date: 2007-06-08 20:56:53 $ | $Date: 2007-06-15 08:04:07 $
| $Author: e107steved $ | $Author: e107coders $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -27,8 +27,8 @@ $db_mySQLQueryCount = 0; // Global total number of db object queries (all db's)
* MySQL Abstraction class * MySQL Abstraction class
* *
* @package e107 * @package e107
* @version $Revision: 1.13 $ * @version $Revision: 1.14 $
* @author $Author: e107steved $ * @author $Author: e107coders $
*/ */
class db { class db {
@@ -511,8 +511,8 @@ class db {
* @desc Enter description here... * @desc Enter description here...
* @access private * @access private
*/ */
function db_Select_gen($query, $debug = FALSE, $log_type = '', $log_remark = '') { function db_Select_gen($query, $debug = FALSE, $log_type = '', $log_remark = '')
{
/* /*
changes by jalist 19/01/05: changes by jalist 19/01/05:
added string replace on table prefix to tidy up long database queries added string replace on table prefix to tidy up long database queries
@@ -521,9 +521,15 @@ class db {
*/ */
$this->tabset = FALSE; $this->tabset = FALSE;
if(strpos($query,'#') !== FALSE) { if(strpos($query,'`#') !== FALSE)
{
$query = preg_replace_callback("/\s`#([\w]*?)`/", array($this, 'ml_check'), $query);
}
elseif(strpos($query,'#') !== FALSE)
{
$query = preg_replace_callback("/\s#([\w]*?)\W/", array($this, 'ml_check'), $query); $query = preg_replace_callback("/\s#([\w]*?)\W/", array($this, 'ml_check'), $query);
} }
if (($this->mySQLresult = $this->db_Query($query, NULL, 'db_Select_gen', $debug, $log_type, $log_remark)) === TRUE) if (($this->mySQLresult = $this->db_Query($query, NULL, 'db_Select_gen', $debug, $log_type, $log_remark)) === TRUE)
{ // Successful query which doesn't return a row count { // Successful query which doesn't return a row count
$this->dbError('db_Select_gen'); $this->dbError('db_Select_gen');
@@ -541,15 +547,21 @@ class db {
} }
} }
function ml_check($matches) { function ml_check($matches)
{
$table = $this->db_IsLang($matches[1]); $table = $this->db_IsLang($matches[1]);
if($this->tabset == false) { if($this->tabset == false)
{
$this->mySQLcurTable = $table; $this->mySQLcurTable = $table;
$this->tabset = true; $this->tabset = true;
} }
$ret = str_replace("#", MPREFIX, $matches[0]);
$ret = str_replace($matches[0], $table, $ret);
// return $ret; // this one fails.
return " ".MPREFIX.$table.substr($matches[0],-1); return " ".MPREFIX.$table.substr($matches[0],-1);
} }
/** /**
* @return unknown * @return unknown
* @param unknown $offset * @param unknown $offset