mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-02 22:02:07 +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
Show Stats 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

3
phpBB/memberlist.php
View File

@ -604,7 +604,8 @@ switch ($mode)
* @since 3.1-A1
* @changed 3.1.0-b2 Added friend and foe status
*/
$vars = array('member', 'user_notes_enabled', 'warn_user_enabled', 'zebra_enabled', 'friends_enabled', 'foes_enabled', 'friend', 'foe');
$vars = array('member', 'user_notes_enabled', 'warn_user_enabled', 'zebra_enabled');
$vars = array_merge($vars, array('friends_enabled', 'foes_enabled', 'friend', 'foe'));
extract($phpbb_dispatcher->trigger_event('core.memberlist_view_profile', compact($vars)));
$template->assign_vars(show_profile($member, $user_notes_enabled, $warn_user_enabled));

4
phpBB/phpbb/log/log.php
View File

@ -405,7 +405,9 @@ class log implements \phpbb\log\log_interface
* e.g.: 'AND l.forum_id = 1'
* @since 3.1-A1
*/
$vars = array('mode', 'count_logs', 'limit', 'offset', 'forum_id', 'topic_id', 'user_id', 'log_time', 'sort_by', 'keywords', 'profile_url', 'log_type', 'sql_additional');
$vars = array('mode', 'count_logs', 'limit', 'offset', 'forum_id', 'topic_id');
$vars = array_merge($vars, array('user_id', 'log_time', 'sort_by', 'keywords'));
$vars = array_merge($vars, array('profile_url', 'log_type', 'sql_additional'));
extract($this->dispatcher->trigger_event('core.get_logs_modify_type', compact($vars)));
if ($log_type === false)

3
phpBB/phpbb/user.php
View File

@ -145,7 +145,8 @@ class user extends \phpbb\session
* @var mixed style_id Style we are going to display
* @since 3.1-A1
*/
$vars = array('user_data', 'user_lang_name', 'user_date_format', 'user_timezone', 'lang_set', 'lang_set_ext', 'style_id');
$vars = array('user_data', 'user_lang_name', 'user_date_format', 'lang_set');
$vars = array_merge($vars, array('user_timezone', 'lang_set_ext', 'style_id'));
extract($phpbb_dispatcher->trigger_event('core.user_setup', compact($vars)));
$this->data = $user_data;

7
phpBB/posting.php
View File

@ -82,7 +82,9 @@ $current_time = time();
* language keys.
* @since 3.1-A1
*/
$vars = array('post_id', 'topic_id', 'forum_id', 'draft_id', 'lastclick', 'submit', 'preview', 'save', 'load', 'delete', 'cancel', 'refresh', 'mode', 'error');
$vars = array('post_id', 'topic_id', 'forum_id', 'draft_id', 'lastclick');
$vars = array_merge($vars, array('submit', 'preview', 'save', 'load', 'delete'));
$vars = array_merge($vars, array('cancel', 'refresh', 'mode', 'error'));
extract($phpbb_dispatcher->trigger_event('core.modify_posting_parameters', compact($vars)));
// Was cancel pressed? If so then redirect to the appropriate page
@ -1561,7 +1563,8 @@ $template->assign_vars(array(
* @since 3.1-A1
* @change 3.1.0-b3 Added vars post_data, moderators, mode, page_title, s_topic_icons, form_enctype, s_action, s_hidden_fields
*/
$vars = array('post_data', 'moderators', 'mode', 'page_title', 's_topic_icons', 'form_enctype', 's_action', 's_hidden_fields');
$vars = array('post_data', 'moderators', 'mode', 'page_title', 's_topic_icons');
$vars = array_merge($vars, array('form_enctype', 's_action', 's_hidden_fields'));
extract($phpbb_dispatcher->trigger_event('core.posting_modify_template_vars', compact($vars)));
// Build custom bbcodes array

12
phpBB/viewtopic.php
View File

@ -1000,7 +1000,8 @@ $sql_ary = array(
* @since 3.1-A1
* @change 3.1.0-a2 Added vars forum_id, topic_id, topic_data, post_list, sort_days, sort_key, sort_dir, start
*/
$vars = array('forum_id', 'topic_id', 'topic_data', 'post_list', 'sort_days', 'sort_key', 'sort_dir', 'start', 'sql_ary');
$vars = array('forum_id', 'topic_id', 'topic_data', 'post_list', 'sort_days');
$vars = array_merge($vars, array('sort_key', 'sort_dir', 'start', 'sql_ary'));
extract($phpbb_dispatcher->trigger_event('core.viewtopic_get_post_data', compact($vars)));
$sql = $db->sql_build_query('SELECT', $sql_ary);
@ -1679,7 +1680,8 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
* @change 3.1.0-a3 Added vars start, current_row_number, end, attachments
* @change 3.1.0-b3 Added topic_data array, total_posts
*/
$vars = array('start', 'current_row_number', 'end', 'total_posts', 'row', 'cp_row', 'attachments', 'user_poster_data', 'post_row', 'topic_data');
$vars = array('start', 'current_row_number', 'end', 'total_posts', 'row', 'cp_row');
$vars = array_merge($vars, array('attachments', 'user_poster_data', 'post_row', 'topic_data'));
extract($phpbb_dispatcher->trigger_event('core.viewtopic_modify_post_row', compact($vars)));
$i = $current_row_number;
@ -1726,14 +1728,18 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
* @var int start Start item of this page
* @var int current_row_number Number of the post on this page
* @var int end Number of posts on this page
* @var int total_posts Total posts count
* @var array row Array with original post and user data
* @var array cp_row Custom profile field data of the poster
* @var array attachments List of attachments
* @var array user_poster_data Poster's data from user cache
* @var array post_row Template block array of the post
* @var array topic_data Array with topic data
* @since 3.1.0-a3
* @change 3.1.0-b3 Added topic_data array, total_posts
*/
$vars = array('start', 'current_row_number', 'end', 'row', 'cp_row', 'attachments', 'user_poster_data', 'post_row');
$vars = array('start', 'current_row_number', 'end', 'total_posts', 'row', 'cp_row');
$vars = array_merge($vars, array('attachments', 'user_poster_data', 'post_row', 'topic_data'));
extract($phpbb_dispatcher->trigger_event('core.viewtopic_post_row_after', compact($vars)));
$i = $current_row_number;