diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-01-09 17:53:04 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-01-09 17:53:04 +0100 |
| commit | b2324607ad7d23450aafddbf6fb286fa05e3a9d5 (patch) | |
| tree | 44b6b7108c59e1e2da190424b0cd8395b3abba47 /phpBB/phpbb/search/fulltext_postgres.php | |
| parent | 81cbabc1f6cebb4e93f9897c9e9e099fa9429ffe (diff) | |
| parent | 3f44f368172f744499055c482dcaccb0108660ab (diff) | |
| download | forums-b2324607ad7d23450aafddbf6fb286fa05e3a9d5.tar forums-b2324607ad7d23450aafddbf6fb286fa05e3a9d5.tar.gz forums-b2324607ad7d23450aafddbf6fb286fa05e3a9d5.tar.bz2 forums-b2324607ad7d23450aafddbf6fb286fa05e3a9d5.tar.xz forums-b2324607ad7d23450aafddbf6fb286fa05e3a9d5.zip | |
Merge pull request #4058 from marc1706/ticket/13454
[ticket/13454] Remove unused variables, globals, and parameters
* marc1706/ticket/13454:
[ticket/13454] Add excessively removed code back
[ticket/13454] Remove more unused variables
[ticket/13454] Remove double semi-colons
[ticket/13454] Remove unused variables
[ticket/13454] Fix code sniffer complaints
[ticket/13454] Fix a few issues introduced by overdeleting stuff
[ticket/13454] Remove unused variables
[ticket/13454] Remove unused variables
[ticket/13454] Remove unused variables
[ticket/13454] Remove unused variables
Diffstat (limited to 'phpBB/phpbb/search/fulltext_postgres.php')
| -rw-r--r-- | phpBB/phpbb/search/fulltext_postgres.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/phpBB/phpbb/search/fulltext_postgres.php b/phpBB/phpbb/search/fulltext_postgres.php index ab28fd2957..42425cbc6b 100644 --- a/phpBB/phpbb/search/fulltext_postgres.php +++ b/phpBB/phpbb/search/fulltext_postgres.php @@ -501,7 +501,6 @@ class fulltext_postgres extends \phpbb\search\base $sql_select = ($type == 'posts') ? 'p.post_id' : 'DISTINCT t.topic_id'; $sql_from = ($join_topic) ? TOPICS_TABLE . ' t, ' : ''; $field = ($type == 'posts') ? 'post_id' : 'topic_id'; - $sql_author = (sizeof($author_ary) == 1) ? ' = ' . $author_ary[0] : 'IN (' . implode(', ', $author_ary) . ')'; if (sizeof($author_ary) && $author_name) { @@ -526,7 +525,6 @@ class fulltext_postgres extends \phpbb\search\base $sql_where_options .= ($sort_days) ? ' AND p.post_time >= ' . (time() - ($sort_days * 86400)) : ''; $sql_where_options .= $sql_match_where; - $tmp_sql_match = array(); $sql_match = str_replace(',', " || ' ' ||", $sql_match); $tmp_sql_match = "to_tsvector ('" . $this->db->sql_escape($this->config['fulltext_postgres_ts_name']) . "', " . $sql_match . ") @@ to_tsquery ('" . $this->db->sql_escape($this->config['fulltext_postgres_ts_name']) . "', '" . $this->db->sql_escape($this->tsearch_query) . "')"; @@ -838,7 +836,7 @@ class fulltext_postgres extends \phpbb\search\base GROUP BY t.topic_id, $sort_by_sql[$sort_key]"; } - $result = $this->db->sql_query($sql_count); + $this->db->sql_query($sql_count); $result_count = (int) $this->db->sql_fetchfield('result_count'); if (!$result_count) |