diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-11-24 21:51:10 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-11-24 21:51:10 -0500 |
| commit | 90a7f55831e563265cb2f9dbf4ac8cdd26c1a5fa (patch) | |
| tree | da2116f54c64f11ef5ea932ff0d91bf3936c112b /phpBB/viewtopic.php | |
| parent | 6b2b98d8550d47c2d9c58d8acd2e9314e1022a87 (diff) | |
| parent | 4c77903129749008cd08c346006d2a57cf6ff544 (diff) | |
| download | forums-90a7f55831e563265cb2f9dbf4ac8cdd26c1a5fa.tar forums-90a7f55831e563265cb2f9dbf4ac8cdd26c1a5fa.tar.gz forums-90a7f55831e563265cb2f9dbf4ac8cdd26c1a5fa.tar.bz2 forums-90a7f55831e563265cb2f9dbf4ac8cdd26c1a5fa.tar.xz forums-90a7f55831e563265cb2f9dbf4ac8cdd26c1a5fa.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/10484' into develop
* nickvergessen/ticket/10484:
[ticket/10484] Use variables for sql_build_query() calls
Conflicts:
phpBB/includes/mcp/mcp_front.php
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index ceb9f3ea1c..e78ba73cd7 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -943,7 +943,7 @@ if (!sizeof($post_list)) // We need to grab it because we do reverse ordering sometimes $max_post_time = 0; -$sql = $db->sql_build_query('SELECT', array( +$sql_ary = array( 'SELECT' => 'u.*, z.friend, z.foe, p.*', 'FROM' => array( @@ -954,14 +954,15 @@ $sql = $db->sql_build_query('SELECT', array( 'LEFT_JOIN' => array( array( 'FROM' => array(ZEBRA_TABLE => 'z'), - 'ON' => 'z.user_id = ' . $user->data['user_id'] . ' AND z.zebra_id = p.poster_id' - ) + 'ON' => 'z.user_id = ' . $user->data['user_id'] . ' AND z.zebra_id = p.poster_id', + ), ), 'WHERE' => $db->sql_in_set('p.post_id', $post_list) . ' - AND u.user_id = p.poster_id' -)); + AND u.user_id = p.poster_id', +); +$sql = $db->sql_build_query('SELECT', $sql_ary); $result = $db->sql_query($sql); $now = phpbb_gmgetdate(time() + $user->timezone + $user->dst); |