aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-10-08 17:21:57 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-10-08 17:21:57 +0200
commit8f10212f3842c7dd5609f99a50866db2e42b9167 (patch)
tree7e8fe89d2233bc91b6f4c35523b0047cc4168a45
parent0af9ee869dcc33ee2b858131bb6d66c4fb8b382e (diff)
parenta0dafbfb5fcb94c947ed55a737e5e5189999a2d5 (diff)
downloadforums-8f10212f3842c7dd5609f99a50866db2e42b9167.tar
forums-8f10212f3842c7dd5609f99a50866db2e42b9167.tar.gz
forums-8f10212f3842c7dd5609f99a50866db2e42b9167.tar.bz2
forums-8f10212f3842c7dd5609f99a50866db2e42b9167.tar.xz
forums-8f10212f3842c7dd5609f99a50866db2e42b9167.zip
Merge branch '3.1.x'
-rw-r--r--phpBB/includes/functions_admin.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 0db087f56b..3515150f93 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -614,7 +614,7 @@ function move_posts($post_ids, $topic_id, $auto_sync = true)
}
/**
- * Perform additional actions before moving posts
+ * Perform additional actions before moving posts
*
* @event core.move_posts_before
* @var array post_ids Array of post ids to move
@@ -646,7 +646,7 @@ function move_posts($post_ids, $topic_id, $auto_sync = true)
$db->sql_query($sql);
/**
- * Perform additional actions after moving posts
+ * Perform additional actions after moving posts
*
* @event core.move_posts_after
* @var array post_ids Array of the moved post ids