diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-06-02 13:26:27 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-06-02 13:26:27 +0000 |
| commit | 7d264396df47c17675dd70601a19cb3a06a45ff0 (patch) | |
| tree | 7928c9d030305706bd31032e208d99ee640b2d50 /phpBB/includes/db/mysqli.php | |
| parent | b087e60113187114ea79ac34184ace96e7bf0a80 (diff) | |
| download | forums-7d264396df47c17675dd70601a19cb3a06a45ff0.tar forums-7d264396df47c17675dd70601a19cb3a06a45ff0.tar.gz forums-7d264396df47c17675dd70601a19cb3a06a45ff0.tar.bz2 forums-7d264396df47c17675dd70601a19cb3a06a45ff0.tar.xz forums-7d264396df47c17675dd70601a19cb3a06a45ff0.zip | |
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
Diffstat (limited to 'phpBB/includes/db/mysqli.php')
| -rw-r--r-- | phpBB/includes/db/mysqli.php | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php index 79230b178a..1a969684a2 100644 --- a/phpBB/includes/db/mysqli.php +++ b/phpBB/includes/db/mysqli.php @@ -67,7 +67,7 @@ class dbal_mysqli extends dbal case 'begin': $result = @mysqli_autocommit($this->db_connect_id, false); $this->transaction = true; - break; + break; case 'commit': $result = @mysqli_commit($this->db_connect_id); @@ -79,13 +79,13 @@ class dbal_mysqli extends dbal @mysqli_rollback($this->db_connect_id); @mysqli_autocommit($this->db_connect_id, true); } - break; + break; case 'rollback': $result = @mysqli_rollback($this->db_connect_id); @mysqli_autocommit($this->db_connect_id, true); $this->transaction = false; - break; + break; default: $result = true; @@ -146,10 +146,10 @@ class dbal_mysqli extends dbal * Build LIMIT query */ function sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0) - { - if ($query != '') + { + if ($query != '') { - $this->query_result = false; + $this->query_result = false; // if $total is set to 0 we do not want to limit the number of rows if ($total == 0) @@ -160,12 +160,12 @@ class dbal_mysqli extends dbal $query .= "\n LIMIT " . ((!empty($offset)) ? $offset . ', ' . $total : $total); - return $this->sql_query($query, $cache_ttl); - } - else - { - return false; - } + return $this->sql_query($query, $cache_ttl); + } + else + { + return false; + } } /** @@ -227,7 +227,7 @@ class dbal_mysqli extends dbal { $this->sql_rowseek($rownum, $query_id); } - + $row = $this->sql_fetchrow($query_id); return isset($row[$field]) ? $row[$field] : false; } @@ -296,9 +296,10 @@ class dbal_mysqli extends dbal $data = '(' . $data . ')'; break; } + return $data; } - + /** * return sql error array * @private |