mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-13 12:14:06 +02:00
some adjustments
nils: please have a look at the @todo comment in mcp_queue.php git-svn-id: file:///svn/phpbb/trunk@6002 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -225,17 +225,7 @@ class dbal
|
||||
case 'SELECT':
|
||||
case 'SELECT_DISTINCT';
|
||||
|
||||
if ($query == 'SELECT_DISTINCT')
|
||||
{
|
||||
$sql .= 'SELECT DISTINCT';
|
||||
}
|
||||
else
|
||||
{
|
||||
$sql .= 'SELECT';
|
||||
}
|
||||
|
||||
$sql .= ' ' . $array['SELECT'];
|
||||
$sql .= ' FROM ';
|
||||
$sql = str_replace('_', ' ', $query) . ' ' . $array['SELECT'] . ' FROM ';
|
||||
|
||||
$table_array = array();
|
||||
foreach ($array['FROM'] as $table_name => $alias)
|
||||
@@ -270,6 +260,7 @@ class dbal
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
return $sql;
|
||||
}
|
||||
|
||||
@@ -316,7 +307,7 @@ class dbal
|
||||
{
|
||||
$this->sql_transaction('rollback');
|
||||
}
|
||||
|
||||
|
||||
if (strlen($message) > 1024)
|
||||
{
|
||||
// We need to define $msg_long_text here to circumvent text stripping.
|
||||
@@ -487,8 +478,6 @@ class dbal
|
||||
|
||||
$this->_sql_report($mode, $query);
|
||||
|
||||
// $this->num_queries['cache']++;
|
||||
|
||||
break;
|
||||
|
||||
case 'record_fromcache':
|
||||
|
Reference in New Issue
Block a user