mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 10:16:36 +02:00
Code Issues Releases Wiki Activity

[ticket/12273] Fix long $vars lines for existing events

Browse Source 
PHPBB3-12273
This commit is contained in:
Joas Schilling
2014-04-20 15:13:13 +02:00
parent 8599554443
commit c2dace762e
10 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,7 +159,9 @@ class acp_bbcodes
* submitting form when $warn_text is true
* @since 3.1.0-a3
*/
$vars = array('action', 'sql_ary', 'bbcode_id', 'display_on_posting', 'bbcode_match', 'bbcode_tpl', 'bbcode_helpline', 'hidden_fields');
$vars = array('action', 'sql_ary', 'bbcode_id', 'display_on_posting');
$vars = array_merge($vars, array('bbcode_match', 'bbcode_tpl'));
$vars = array_merge($vars, array('bbcode_helpline', 'hidden_fields'));
extract($phpbb_dispatcher->trigger_event('core.acp_bbcodes_modify_create', compact($vars)));
$warn_text = preg_match('%<[^>]*\{text[\d]*\}[^>]*>%i', $bbcode_tpl);

3
phpBB/includes/acp/acp_forums.php
View File

@@ -707,7 +707,8 @@ class acp_forums
* @var array template_data Array with new forum data
* @since 3.1-A1
*/
$vars = array('action', 'update', 'forum_id', 'row', 'forum_data', 'parents_list', 'errors', 'template_data');
$vars = array('action', 'update', 'forum_id', 'row', 'forum_data');
$vars = array_merge($vars, array('parents_list', 'errors', 'template_data'));
extract($phpbb_dispatcher->trigger_event('core.acp_manage_forums_display_form', compact($vars)));
$template->assign_vars($template_data);

9
phpBB/includes/functions_admin.php
View File

@@ -755,7 +755,8 @@ function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync =
* @var array delete_notifications_types Array with notifications types to delete
* @since 3.1.0-a4
*/
$vars = array('where_type', 'where_ids', 'auto_sync', 'posted_sync', 'post_count_sync', 'call_delete_topics', 'delete_notifications_types');
$vars = array('where_type', 'where_ids', 'auto_sync', 'posted_sync', 'post_count_sync');
$vars = array_merge($vars, array('call_delete_topics', 'delete_notifications_types'));
extract($phpbb_dispatcher->trigger_event('core.delete_posts_before', compact($vars)));
if ($where_type === 'range')
@@ -912,7 +913,8 @@ function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync =
* @var array delete_notifications_types Array with notifications types to delete
* @since 3.1.0-a4
*/
$vars = array('post_ids', 'poster_ids', 'topic_ids', 'forum_ids', 'where_type', 'where_ids', 'delete_notifications_types');
$vars = array('post_ids', 'poster_ids', 'topic_ids', 'forum_ids', 'where_type');
$vars = array_merge($vars, array('where_ids', 'delete_notifications_types'));
extract($phpbb_dispatcher->trigger_event('core.delete_posts_in_transaction', compact($vars)));
$db->sql_transaction('commit');
@@ -930,7 +932,8 @@ function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync =
* @var array delete_notifications_types Array with notifications types to delete
* @since 3.1.0-a4
*/
$vars = array('post_ids', 'poster_ids', 'topic_ids', 'forum_ids', 'where_type', 'where_ids', 'delete_notifications_types');
$vars = array('post_ids', 'poster_ids', 'topic_ids', 'forum_ids', 'where_type');
$vars = array_merge($vars, array('where_ids', 'delete_notifications_types'));
extract($phpbb_dispatcher->trigger_event('core.delete_posts_after', compact($vars)));
// Resync topics_posted table

3
phpBB/includes/functions_content.php
View File

@@ -1410,7 +1410,8 @@ function get_username_string($mode, $user_id, $username, $username_colour = '',
* @var array _profile_cache Array of original return templates
* @since 3.1-A1
*/
$vars = array('mode', 'user_id', 'username', 'username_colour', 'guest_username', 'custom_profile_url', 'username_string', '_profile_cache');
$vars = array('mode', 'user_id', 'username', 'username_colour', 'guest_username');
$vars = array_merge($vars, array('custom_profile_url', 'username_string', '_profile_cache'));
extract($phpbb_dispatcher->trigger_event('core.modify_username_string', compact($vars)));
return $username_string;

3
phpBB/includes/functions_posting.php
View File

@@ -1497,7 +1497,8 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
* @var bool update_search_index Flag indicating if the search index will be updated
* @since 3.1.0-a4
*/
$vars = array('mode', 'subject', 'username', 'topic_type', 'poll', 'data', 'update_message', 'update_search_index');
$vars = array('mode', 'subject', 'username', 'topic_type', 'poll', 'data');
$vars = array_merge($vars, array('update_message', 'update_search_index'));
extract($phpbb_dispatcher->trigger_event('core.modify_submit_post_data', compact($vars)));
// We do not handle erasing posts here