makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1945 from VSEphpbb/ticket/12104

Browse source 
[ticket/12104] Replace shadow topics $sql with $sql_array for better Eve...
This commit is contained in:
Nathan Guse 2014-01-17 18:08:19 -08:00
commit 54afdeb7ee
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
phpBB/viewforum.php
View file

@ -556,20 +556,26 @@ if (sizeof($topic_list))
// If we have some shadow topics, update the rowset to reflect their topic information // If we have some shadow topics, update the rowset to reflect their topic information
if (sizeof($shadow_topic_list)) if (sizeof($shadow_topic_list))
{ {
$sql = 'SELECT * // SQL array for obtaining shadow topics
FROM ' . TOPICS_TABLE . ' $sql_array = array(
WHERE ' . $db->sql_in_set('topic_id', array_keys($shadow_topic_list)); 'SELECT' => 't.*',
'FROM' => array(
TOPICS_TABLE => 't'
),
'WHERE' => $db->sql_in_set('t.topic_id', array_keys($shadow_topic_list)),
);
/** /**
* Event to modify the SQL query before the shadowtopic data is retrieved * Event to modify the SQL query before the shadowtopic data is retrieved
* *
* @event core.viewforum_get_shadowtopic_data * @event core.viewforum_get_shadowtopic_data
* @var string sql The SQL string to get the data of any shadowtopics * @var array sql_array SQL array to get the data of any shadowtopics
* @since 3.1-A1 * @since 3.1-A1
*/ */
$vars = array('sql'); $vars = array('sql_array');
extract($phpbb_dispatcher->trigger_event('core.viewforum_get_shadowtopic_data', compact($vars))); extract($phpbb_dispatcher->trigger_event('core.viewforum_get_shadowtopic_data', compact($vars)));
$sql = $db->sql_build_query('SELECT', $sql_array);
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))