diff options
| author | David M <davidmj@users.sourceforge.net> | 2007-08-24 18:09:59 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2007-08-24 18:09:59 +0000 |
| commit | 4d0b422884d9d6cc6f28644acb2bdd93e33809d2 (patch) | |
| tree | 198ff304bfb2312d7b03189b599ec96a658074fc /phpBB/includes/db | |
| parent | 4c504813795b89b525be4d46268096d51335c80c (diff) | |
| download | forums-4d0b422884d9d6cc6f28644acb2bdd93e33809d2.tar forums-4d0b422884d9d6cc6f28644acb2bdd93e33809d2.tar.gz forums-4d0b422884d9d6cc6f28644acb2bdd93e33809d2.tar.bz2 forums-4d0b422884d9d6cc6f28644acb2bdd93e33809d2.tar.xz forums-4d0b422884d9d6cc6f28644acb2bdd93e33809d2.zip | |
#14207
git-svn-id: file:///svn/phpbb/trunk@8069 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/db')
| -rw-r--r-- | phpBB/includes/db/firebird.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php index bc171e61be..771592a02a 100644 --- a/phpBB/includes/db/firebird.php +++ b/phpBB/includes/db/firebird.php @@ -164,9 +164,13 @@ class dbal_firebird extends dbal } } - if (!function_exists('ibase_affected_rows') && (preg_match('/^UPDATE ([\w_]++)\s+SET [\w_]++\s*=\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+)(?:,\s*[\w_]++\s*=\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+))*+\s+(WHERE.*)$/s', $query, $regs) || preg_match('/^DELETE FROM ([\w_]++)\s*WHERE\s*(.*)$/s', $query, $regs))) + if (!function_exists('ibase_affected_rows') && (preg_match('/^UPDATE ([\w_]++)\s+SET [\w_]++\s*=\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+)(?:,\s*[\w_]++\s*=\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+))*+\s+(WHERE.*)?$/s', $query, $regs) || preg_match('/^DELETE FROM ([\w_]++)\s*(WHERE\s*.*)?$/s', $query, $regs))) { - $affected_sql = 'SELECT COUNT(*) as num_rows_affected FROM ' . $regs[1] . ' ' . $regs[2]; + $affected_sql = 'SELECT COUNT(*) as num_rows_affected FROM ' . $regs[1]; + if (!empty($regs[2])) + { + $affected_sql .= ' ' . $regs[2]; + } if (!($temp_q_id = @ibase_query($this->db_connect_id, $affected_sql))) { |