aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/posting.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2017-02-11 15:21:00 +0100
committerMarc Alexander <admin@m-a-styles.de>2017-02-11 21:48:20 +0100
commitf27cdad73e7a4af913414522d85855136bf50b31 (patch)
tree33ce0eb4d82bdf011b6235b60daea812c3902982 /phpBB/posting.php
parent59ad9401d9db8c6b6612f01f7b295f12c4cdccf7 (diff)
parent45199adebdfc00f436a719de1c5772429367b756 (diff)
downloadforums-f27cdad73e7a4af913414522d85855136bf50b31.tar
forums-f27cdad73e7a4af913414522d85855136bf50b31.tar.gz
forums-f27cdad73e7a4af913414522d85855136bf50b31.tar.bz2
forums-f27cdad73e7a4af913414522d85855136bf50b31.tar.xz
forums-f27cdad73e7a4af913414522d85855136bf50b31.zip
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/posting.php')
-rw-r--r--phpBB/posting.php14
1 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php
index aa10059796..0ab23785ec 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -84,7 +84,7 @@ $current_time = time();
* NOTE: Should be actual language strings, NOT
* language keys.
* @since 3.1.0-a1
-* @change 3.1.2-RC1 Removed 'delete' var as it does not exist
+* @changed 3.1.2-RC1 Removed 'delete' var as it does not exist
*/
$vars = array(
'post_id',
@@ -1267,8 +1267,8 @@ if ($submit || $preview || $refresh)
* @var array error Any error strings; a non-empty array aborts form submission.
* NOTE: Should be actual language strings, NOT language keys.
* @since 3.1.0-RC5
- * @change 3.1.5-RC1 Added poll array to the event
- * @change 3.2.0-a1 Removed undefined page_title
+ * @changed 3.1.5-RC1 Added poll array to the event
+ * @changed 3.2.0-a1 Removed undefined page_title
*/
$vars = array(
'post_data',
@@ -1885,13 +1885,13 @@ if (($mode == 'post' || ($mode == 'edit' && $post_id == $post_data['topic_first_
* posting page via $template->assign_vars()
* @var object message_parser The message parser object
* @since 3.1.0-a1
-* @change 3.1.0-b3 Added vars post_data, moderators, mode, page_title,
+* @changed 3.1.0-b3 Added vars post_data, moderators, mode, page_title,
* s_topic_icons, form_enctype, s_action, s_hidden_fields,
* post_id, topic_id, forum_id, submit, preview, save, load,
* delete, cancel, refresh, error, page_data, message_parser
-* @change 3.1.2-RC1 Removed 'delete' var as it does not exist
-* @change 3.1.5-RC1 Added poll variables to the page_data array
-* @change 3.1.6-RC1 Added 'draft_id' var
+* @changed 3.1.2-RC1 Removed 'delete' var as it does not exist
+* @changed 3.1.5-RC1 Added poll variables to the page_data array
+* @changed 3.1.6-RC1 Added 'draft_id' var
*/
$vars = array(
'post_data',