diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-10-20 15:31:06 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-10-20 15:31:06 -0400 |
| commit | 79d6f67e81f9f039eccf48bbb310e6278fdc4593 (patch) | |
| tree | fe6e4e89873371f2ba9a61bb714f7dba6ef08324 | |
| parent | ee97b92e5d6fca295b029c9732de5f8ea05831bb (diff) | |
| parent | 973dfbf868f2c75c02ae7cdff0056ecf9c665d70 (diff) | |
| download | forums-79d6f67e81f9f039eccf48bbb310e6278fdc4593.tar forums-79d6f67e81f9f039eccf48bbb310e6278fdc4593.tar.gz forums-79d6f67e81f9f039eccf48bbb310e6278fdc4593.tar.bz2 forums-79d6f67e81f9f039eccf48bbb310e6278fdc4593.tar.xz forums-79d6f67e81f9f039eccf48bbb310e6278fdc4593.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13188] Correctly format string concatenation
[ticket/13188] Add missing where clause to post_id query in sphinx index
| -rw-r--r-- | phpBB/phpbb/search/fulltext_sphinx.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/phpbb/search/fulltext_sphinx.php b/phpBB/phpbb/search/fulltext_sphinx.php index 427464eb3c..eb53ca6d40 100644 --- a/phpBB/phpbb/search/fulltext_sphinx.php +++ b/phpBB/phpbb/search/fulltext_sphinx.php @@ -715,6 +715,7 @@ class fulltext_sphinx ), 'ON' => 'p1.topic_id = p2.topic_id', )), + 'WHERE' => 'p2.post_id = ' . ((int) $post_id), ); $sql = $this->db->sql_build_query('SELECT', $sql_array); |