diff options
author | Marc Alexander <admin@m-a-styles.de> | 2017-02-11 15:21:00 +0100 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2017-02-11 21:48:20 +0100 |
commit | f27cdad73e7a4af913414522d85855136bf50b31 (patch) | |
tree | 33ce0eb4d82bdf011b6235b60daea812c3902982 /phpBB/includes/ucp/ucp_pm_compose.php | |
parent | 59ad9401d9db8c6b6612f01f7b295f12c4cdccf7 (diff) | |
parent | 45199adebdfc00f436a719de1c5772429367b756 (diff) | |
download | forums-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/includes/ucp/ucp_pm_compose.php')
-rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index b3c0752a2f..06f76aa01a 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -280,7 +280,7 @@ function compose_pm($id, $mode, $action, $user_folders = array()) * @var bool delete Whether the user is deleting the PM * @var int reply_to_all Value of reply_to_all request variable. * @since 3.1.0-RC5 - * @change 3.2.0-a1 Removed undefined variables + * @changed 3.2.0-a1 Removed undefined variables */ $vars = array( 'sql', @@ -345,7 +345,7 @@ function compose_pm($id, $mode, $action, $user_folders = array()) * @var bool delete If deleting message * @var int reply_to_all Value of reply_to_all request variable. * @since 3.1.0-RC5 - * @change 3.2.0-a1 Removed undefined variables + * @changed 3.2.0-a1 Removed undefined variables */ $vars = array( 'sql', |