Merge branch '3.1.x'

This commit is contained in:
Marc Alexander 2015-07-20 09:39:42 +02:00
commit cdaf4381ac

View file

@ -1387,10 +1387,9 @@ if ($submit || $preview || $refresh)
* @var string post_author_name Author name for guest posts * @var string post_author_name Author name for guest posts
* @var bool update_message Boolean if the post message was changed * @var bool update_message Boolean if the post message was changed
* @var bool update_subject Boolean if the post subject was changed * @var bool update_subject Boolean if the post subject was changed
* @var bool submit Whether or not the form has been submitted
* @var array error Any error strings; a non-empty array aborts form submission.
* NOTE: Should be actual language strings, NOT language keys. * NOTE: Should be actual language strings, NOT language keys.
* @since 3.1.0-RC5 * @since 3.1.0-RC5
* @changed 3.1.6-RC1 remove submit and error from event Submit and Error are checked previously prior to running event
*/ */
$vars = array( $vars = array(
'post_data', 'post_data',
@ -1404,8 +1403,6 @@ if ($submit || $preview || $refresh)
'post_author_name', 'post_author_name',
'update_message', 'update_message',
'update_subject', 'update_subject',
'submit',
'error',
); );
extract($phpbb_dispatcher->trigger_event('core.posting_modify_submit_post_before', compact($vars))); extract($phpbb_dispatcher->trigger_event('core.posting_modify_submit_post_before', compact($vars)));
@ -1429,10 +1426,9 @@ if ($submit || $preview || $refresh)
* @var bool update_message Boolean if the post message was changed * @var bool update_message Boolean if the post message was changed
* @var bool update_subject Boolean if the post subject was changed * @var bool update_subject Boolean if the post subject was changed
* @var string redirect_url URL the user is going to be redirected to * @var string redirect_url URL the user is going to be redirected to
* @var bool submit Whether or not the form has been submitted
* @var array error Any error strings; a non-empty array aborts form submission.
* NOTE: Should be actual language strings, NOT language keys. * NOTE: Should be actual language strings, NOT language keys.
* @since 3.1.0-RC5 * @since 3.1.0-RC5
* @changed 3.1.6-RC1 remove submit and error from event Submit and Error are checked previously prior to running event
*/ */
$vars = array( $vars = array(
'post_data', 'post_data',
@ -1447,8 +1443,6 @@ if ($submit || $preview || $refresh)
'update_message', 'update_message',
'update_subject', 'update_subject',
'redirect_url', 'redirect_url',
'submit',
'error',
); );
extract($phpbb_dispatcher->trigger_event('core.posting_modify_submit_post_after', compact($vars))); extract($phpbb_dispatcher->trigger_event('core.posting_modify_submit_post_after', compact($vars)));