diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2010-04-29 15:15:23 -0400 |
|---|---|---|
| committer | Dhruv Goel <dhruv.goel92@gmail.com> | 2012-07-05 21:10:50 +0530 |
| commit | 98bc7fa6ce8dff493bdf0e09e1d09bc27eb31a6e (patch) | |
| tree | e184108a4a2387829ee2be237d2cad647339b115 /phpBB/includes | |
| parent | b1378f20af2b584fd282d9ecb4007e976ac74dc2 (diff) | |
| download | forums-98bc7fa6ce8dff493bdf0e09e1d09bc27eb31a6e.tar forums-98bc7fa6ce8dff493bdf0e09e1d09bc27eb31a6e.tar.gz forums-98bc7fa6ce8dff493bdf0e09e1d09bc27eb31a6e.tar.bz2 forums-98bc7fa6ce8dff493bdf0e09e1d09bc27eb31a6e.tar.xz forums-98bc7fa6ce8dff493bdf0e09e1d09bc27eb31a6e.zip | |
[feature/postgresql-fulltext-search] Fixed braces
Fixes braces in fulltext_postgres.php to comply with phpbb conventions.
PHPBB3-9730
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/search/fulltext_postgres.php | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/phpBB/includes/search/fulltext_postgres.php b/phpBB/includes/search/fulltext_postgres.php index 843ebe69b2..18a5b402bf 100644 --- a/phpBB/includes/search/fulltext_postgres.php +++ b/phpBB/includes/search/fulltext_postgres.php @@ -66,7 +66,8 @@ class fulltext_postgres extends search_backend } - if (!$this->tsearch_builtin) { + if (!$this->tsearch_builtin) + { $db->sql_query("SELECT set_curcfg('" . $db->sql_escape($config['fulltext_postgres_ts_name']) . "')"); } } @@ -86,7 +87,8 @@ class fulltext_postgres extends search_backend return $user->lang['FULLTEXT_POSTGRES_INCOMPATIBLE_VERSION']; } - if (!$this->tsearch_builtin) { + if (!$this->tsearch_builtin) + { $sql = "SELECT c.relname FROM pg_catalog.pg_class c WHERE c.relkind = 'r' @@ -446,7 +448,7 @@ class fulltext_postgres extends search_backend $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) { // first one matches post of registered users, second one guests and deleted users @@ -460,7 +462,7 @@ class fulltext_postgres extends search_backend { $sql_author = ''; } - + $sql_where_options = $sql_sort_join; $sql_where_options .= ($topic_id) ? ' AND p.topic_id = ' . $topic_id : ''; $sql_where_options .= ($join_topic) ? ' AND t.topic_id = p.topic_id' : ''; @@ -576,7 +578,7 @@ class fulltext_postgres extends search_backend } $id_ary = array(); - + // Create some display specific sql strings if ($author_name) { @@ -625,7 +627,7 @@ class fulltext_postgres extends search_backend { $m_approve_fid_sql = ' AND (p.post_approved = 1 OR ' . $db->sql_in_set('p.forum_id', $m_approve_fid_ary, true) . ')'; } - + // Build the query for really selecting the post_ids if ($type == 'posts') { |