diff options
| author | David M <davidmj@users.sourceforge.net> | 2007-07-30 21:15:55 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2007-07-30 21:15:55 +0000 |
| commit | 03efc190e9f1d50058c145ce659c31d117dc970b (patch) | |
| tree | 1315be44d8a3f6f6afa35bb58b5dd0aac5f070d6 | |
| parent | 6aaf8d1ad7871d5f1dcb621d7df832d36c5e638b (diff) | |
| download | forums-03efc190e9f1d50058c145ce659c31d117dc970b.tar forums-03efc190e9f1d50058c145ce659c31d117dc970b.tar.gz forums-03efc190e9f1d50058c145ce659c31d117dc970b.tar.bz2 forums-03efc190e9f1d50058c145ce659c31d117dc970b.tar.xz forums-03efc190e9f1d50058c145ce659c31d117dc970b.zip | |
LEAVE
git-svn-id: file:///svn/phpbb/trunk@7985 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/install/database_update.php | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 9d56717ee5..0763fb3ea5 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1547,19 +1547,12 @@ function _sql($sql, &$errored, &$error_ary, $echo_dot = true) $db->sql_return_on_error(true); - if (preg_match('/^\\s*SELECT/', $sql)) - { - $result = $db->sql_query($sql); - if ($db->sql_error_triggered) - { - $errored = true; - $error_ary['sql'][] = $db->sql_error_sql; - $error_ary['error_code'][] = $db->_sql_error(); - } - } - else + $result = $db->sql_query($sql); + if ($db->sql_error_triggered) { - var_dump($sql); + $errored = true; + $error_ary['sql'][] = $db->sql_error_sql; + $error_ary['error_code'][] = $db->_sql_error(); } $db->sql_return_on_error(false); @@ -1569,7 +1562,7 @@ function _sql($sql, &$errored, &$error_ary, $echo_dot = true) echo ". \n"; flush(); } -if (preg_match('/^\\s*SELECT/', $sql)) + return $result; } |