mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

[ticket/12060] Use $sql_ary instead of $sql

Browse Source 
PHPBB3-12060
This commit is contained in:
Matt Friedman
2013-12-12 13:50:13 -08:00
parent b6eb1f66e1
commit 6ccec39e43
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
phpBB/includes/acp/acp_bbcodes.php
View File

@@ -342,24 +342,26 @@ class acp_bbcodes
'U_ACTION' => $this->u_action . '&action=add',
);
$sql = 'SELECT *
FROM ' . BBCODES_TABLE . '
ORDER BY bbcode_tag';
$sql_ary = array(
'SELECT' => 'b.*',
'FROM' => array(BBCODES_TABLE => 'b'),
'ORDER_BY' => 'b.bbcode_tag',
);
/**
* Modify bbcode template data before we display the form
*
* @event core.acp_bbcodes_display_form
* @var string action Type of the action: modify|create
* @var string sql SQL statement to get bbcode data
* @var string sql_ary The SQL array to get custom bbcode data
* @var array template_data Array with form template data
* @var object this_u_action $this->u_action object
* @since 3.1-A3
*/
$vars = array('action', 'sql', 'template_data', 'this_u_action');
$vars = array('action', 'sql_ary', 'template_data', 'this_u_action');
extract($phpbb_dispatcher->trigger_event('core.acp_bbcodes_display_form', compact($vars)));
$result = $db->sql_query($sql);
$result = $db->sql_query($db->sql_build_query('SELECT', $sql_ary));
$template->assign_vars($template_data);
@@ -387,7 +389,7 @@ class acp_bbcodes
}
$db->sql_freeresult($result);
$this->u_action = $this_u_action;
}