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/includes/functions_display.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/includes/functions_display.php')
| -rw-r--r-- | phpBB/includes/functions_display.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 39d0793030..2b871a21ec 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -110,7 +110,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod $sql_array['SELECT'] .= ', fa.user_id'; } - $sql = $db->sql_build_query('SELECT', array( + $sql_ary = array( 'SELECT' => $sql_array['SELECT'], 'FROM' => $sql_array['FROM'], 'LEFT_JOIN' => $sql_array['LEFT_JOIN'], @@ -118,8 +118,9 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod 'WHERE' => $sql_where, 'ORDER_BY' => 'f.left_id', - )); + ); + $sql = $db->sql_build_query('SELECT', $sql_ary); $result = $db->sql_query($sql); $forum_tracking_info = array(); |