diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-11-12 11:10:25 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-11-12 11:16:39 +0100 |
| commit | 0fd3bb170b95bc8c99329e47990e38c038629075 (patch) | |
| tree | 4222da246667aba91d51a4c2e335c317a766f18a /phpBB/includes/db/driver/driver.php | |
| parent | bf641a7f31f87eb7b88437214315872bff36ae84 (diff) | |
| download | forums-0fd3bb170b95bc8c99329e47990e38c038629075.tar forums-0fd3bb170b95bc8c99329e47990e38c038629075.tar.gz forums-0fd3bb170b95bc8c99329e47990e38c038629075.tar.bz2 forums-0fd3bb170b95bc8c99329e47990e38c038629075.tar.xz forums-0fd3bb170b95bc8c99329e47990e38c038629075.zip | |
[ticket/11015] Fixup some things from the big merge
PHPBB3-11015
Diffstat (limited to 'phpBB/includes/db/driver/driver.php')
| -rw-r--r-- | phpBB/includes/db/driver/driver.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/db/driver/driver.php b/phpBB/includes/db/driver/driver.php index 9692ee71b9..4b831d2f79 100644 --- a/phpBB/includes/db/driver/driver.php +++ b/phpBB/includes/db/driver/driver.php @@ -206,7 +206,7 @@ class phpbb_db_driver $query_id = $this->query_result; } - if (isset($cache->sql_rowset[$query_id])) + if ($cache->sql_exists($query_id)) { return $cache->sql_rowseek($rownum, $query_id); } @@ -256,7 +256,7 @@ class phpbb_db_driver $this->sql_rowseek($rownum, $query_id); } - if (!is_object($query_id) && isset($cache->sql_rowset[$query_id])) + if (!is_object($query_id) && $cache->sql_exists($query_id)) { return $cache->sql_fetchfield($query_id, $field); } @@ -766,8 +766,8 @@ class phpbb_db_driver // Show complete SQL error and path to administrators only // Additionally show complete error on installation or if extended debug mode is enabled - // The DEBUG_EXTRA constant is for development only! - if ((isset($auth) && $auth->acl_get('a_')) || defined('IN_INSTALL') || defined('DEBUG_EXTRA')) + // The DEBUG constant is for development only! + if ((isset($auth) && $auth->acl_get('a_')) || defined('IN_INSTALL') || defined('DEBUG')) { $message .= ($sql) ? '<br /><br />SQL<br /><br />' . htmlspecialchars($sql) : ''; } |