diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-08-07 12:09:01 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-08-07 12:09:01 +0200 |
| commit | 58d1dcc7f2872b2c9116254d0eae3a5ee1bea48e (patch) | |
| tree | ac804c383316e276dedb3c8058a4dd8676928376 /phpBB/phpbb/db/driver/driver.php | |
| parent | 89a6fed91d9344152f0b2a0779d3d458f3311ecf (diff) | |
| parent | cc32ee8a2848b902f7dc9d809499855a78cb41f4 (diff) | |
| download | forums-58d1dcc7f2872b2c9116254d0eae3a5ee1bea48e.tar forums-58d1dcc7f2872b2c9116254d0eae3a5ee1bea48e.tar.gz forums-58d1dcc7f2872b2c9116254d0eae3a5ee1bea48e.tar.bz2 forums-58d1dcc7f2872b2c9116254d0eae3a5ee1bea48e.tar.xz forums-58d1dcc7f2872b2c9116254d0eae3a5ee1bea48e.zip | |
Merge pull request #2637 from Nicofuma/ticket/12387
[ticket/12387] Cleanup *_free_result call and remove @ on that call
* Nicofuma/ticket/12387:
[ticket/12387] Fix a call to sql_freeresult in full_text_native
[ticket/12387] Fix \phpbb\db\driver\mysqli::sql_freeresult
[ticket/12387] Use the hash as query_id for caching
[ticket/12387] Remove unnecessary checks
[ticket/12387] mssql_query return true if a select query returns 0 row
[ticket/12387] Cleanup *_free_result call and remove @ on that call
Diffstat (limited to 'phpBB/phpbb/db/driver/driver.php')
| -rw-r--r-- | phpBB/phpbb/db/driver/driver.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/phpbb/db/driver/driver.php b/phpBB/phpbb/db/driver/driver.php index 3e9110d8bc..ab126168b6 100644 --- a/phpBB/phpbb/db/driver/driver.php +++ b/phpBB/phpbb/db/driver/driver.php @@ -271,7 +271,7 @@ abstract class driver implements driver_interface $query_id = $this->query_result; } - if ($query_id !== false) + if ($query_id) { $result = array(); while ($row = $this->sql_fetchrow($query_id)) @@ -302,7 +302,7 @@ abstract class driver implements driver_interface return $cache->sql_rowseek($rownum, $query_id); } - if ($query_id === false) + if (!$query_id) { return false; } @@ -310,7 +310,7 @@ abstract class driver implements driver_interface $this->sql_freeresult($query_id); $query_id = $this->sql_query($this->last_query_text); - if ($query_id === false) + if (!$query_id) { return false; } @@ -339,7 +339,7 @@ abstract class driver implements driver_interface $query_id = $this->query_result; } - if ($query_id !== false) + if ($query_id) { if ($rownum !== false) { |