diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 4ad8bae7f7..3fc6ceaa52 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -104,7 +104,7 @@
[Fix] Fix dynamic config update routine error if firebird is used (Bug #46315)
[Fix] Allow friends/foes to be added and removed at the same time. (Bug #46255 - Patch by bantu)
[Fix] Only change topic/post icon if icons are enabled and user is allowed to. (Bug #46355 - Patch by bantu)
- [Fix] Fix saving custom profile fields in ACP if Oracle used (Bug #46015)
+ [Fix] Fix saving custom profile fields in ACP if Oracle is used. (Bug #46015)
[Fix] Make view_log() more resilient to corrupt serialized data. (Bug #46545)
[Fix] Show error if hostname lookup doesn't return a valid IP address when banning. (Bug #45585 - Patch by bantu)
[Fix] Fix incorrect layout when loading private message draft. (Bug #38435 - Patch by nickvergessen)
@@ -130,7 +130,7 @@
[Fix] Fix reapply_sid() to correctly strip session id in certain circumstances (Bug #43125 - Patch by leviatan21)
[Fix] Correctly state why one language pack is marked with an asterisk in the ACP. (Bug #37565 - Patch by bantu)
[Fix] Correctly check if install directory is still present. (Bug #46965 - Patch by rxu)
- [Fix] Correct banned user behaviour when "force password change" is enabled (Bug #47145 - Patch by nickvergessen and leviatan21 )
+ [Fix] Correct banned user behaviour when "force password change" is enabled (Bug #47145 - Patch by nickvergessen and leviatan21)
[Fix] Correctly display ACP logs options, without permission to clear logs. (Bug #24155 - Patch by leviatan21)
[Fix] Display topic icons in MCP forum view again (only prosilver).
[Fix] Properly display post status messages in topic when post is reported and unapproved (Bug #44455 - Patch by leviatan21)
@@ -181,7 +181,7 @@
[Fix] Do not send private message back to sender if sender is in the same group the private message was sent to.
[Fix] Correctly add user to a group making it a default one. (Bug #48345 - Patch by rxu)
[Fix] Add log entry when copying forum permissions.
- [Fix] Min/max characters per posts also affects polls option (Bug #47295 - Patch by nickvergessen)
+ [Fix] Min/max characters per posts no longer affects poll options (Bug #47295 - Patch by nickvergessen)
[Fix] Correctly log action when users request to join a group (Bug #37585 - Patch by nickvergessen)
[Fix] Do not try to create thumbnails for images we cannot open properly. (Bug #48695)
[Fix] Apply locale-independent basename() to attachment filenames. New function added: utf8_basename(). (Bug #43335 - Patch by ocean=Yohsuke)
@@ -202,11 +202,11 @@
[Fix] Make sure only logs for existing users are displayed and user-specific logs removed on user deletion. (Bug #49855)
[Fix] Only show "Add friend" and "Add foe" links if the specific module is enabled. (Bug #50475)
[Fix] Correctly display list items in forum description in prosilver and administration. (Bug #48055 - Patch by leviatan21)
- [Fix] Fix handling of bookmarks and subscriptions on "split topcis", "merge topics" and "merge posts". (Bug #50035)
+ [Fix] Fix handling of bookmarks and subscriptions on "split topics", "merge topics" and "merge posts". (Bug #50035)
[Fix] Only embed cron.php if there is no cron lock present to reduce overhead. (Bug #45725 - Patch by TerryE)
[Fix] Add header gradient back into subsilver2 but keep site logo easily replaceable with smaller and bigger ones. (Bug #11142 - Patch by dark/Rain and Raimon)
- [Fix] Activation email not sent from user settings (Bug #43145)
- [Fix] Resend activation e-mail link inappropriate if using Admin activation (Bug #44375 - Patch by bbrunnrman)
+ [Fix] Send activation email when activating user from user settings. (Bug #43145)
+ [Fix] Do not show resend activation email link when using admin activation. (Bug #44375 - Patch by bbrunnrman)
[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).
[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.
[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)
@@ -220,8 +220,8 @@
[Change] INCLUDEPHP not depending on phpbb_root_path (Bug #45805 - Patch by nickvergessen)
[Change] Ability to fetch moderators with get_moderators() even if load_moderators setting is off. (Bug #35955)
[Change] "Post details" links with image in MCP. (Bug #39845 - Patch by leviatan21)
- [Change] Pm history only shows pms of the receipts you currently reply to (Bug #39505 - Patch by nickvergessen)
- [Change] Add quote-button for own pm's in pm-history (Bug #37285 - Patch by nickvergessen)
+ [Change] PM history now only shows PMs of users you currently reply to. (Bug #39505 - Patch by nickvergessen)
+ [Change] Show quote button for own PMs in PM history. (Bug #37285 - Patch by nickvergessen)
[Change] Fetch requested cookie variables directly from cookie super global. (Bug #47785)
[Change] Add confirmation for deactivating styles (Bug #14304 - Patch by leviatan21)
[Change] Add confirmation for deactivating language packs (Patch by leviatan21)
@@ -270,7 +270,7 @@
[Feature] Add bare-bones quick-reply editor to viewtopic.
[Feature] Detect when a post has been altered by someone else while editing. (Patch by bantu)
[Feature] Add unread posts quick search option (Bug #46765 - Patch by rxu)
- [Feature] Add option to disable remote upload avatars (Bug #45375 - Patch by nickvergessen)
+ [Feature] Add option to disable avatar uploads from remote locations. (Bug #45375 - Patch by nickvergessen)
[Feature] Ability to delete warnings and keep warnings permanently (Bug #43375 - Patch by nickvergessen)
[Feature] Ability to empty a user's outbox from the user ACP quick tools.
[Feature] Ability to search ACP / MCP logs
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
index d71a781ae7..15ad18ba87 100644
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
@@ -95,7 +95,7 @@ class phpbb_captcha_qa
$this->select_question();
}
}
-
+
/**
* API function
*/
@@ -442,7 +442,7 @@ class phpbb_captcha_qa
$this->load_answer();
}
-
+
/**
* Look up everything we need and populate the instance variables.
*/
@@ -812,7 +812,7 @@ class phpbb_captcha_qa
function acp_add_question($data)
{
global $db, $cache;
-
+
$langs = $this->get_languages();
$question_ary = $data;