mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-24 10:31:57 +02:00
Code Issues Releases Wiki Activity

Merge remote branch 'github-cs278/bug/54855' into bug/cs278/54855

Browse Source
This commit is contained in:
Nils Adermann
2010-03-02 20:46:19 +01:00
parent 24fda6671d 2f6c8a0164
commit 72e2af08e1
2 changed files with 2 additions and 1 deletions

1
phpBB/docs/CHANGELOG.html

@@ -97,6 +97,7 @@
<li>[Fix] No longer return the character O in generated random strings and passwords. (Bug #57345)</li>
<li>[Fix] Allow redirect() function to redirect across directories. (Bug #56965)</li>
<li>[Fix] Add terminating semicolons to JavaScript code. (Bug #58085 - Patch by nn-)</li>
<li>[Fix] Minor language fixes. (Bug #54855)</li>
<li>[Feature] Support for Microsoft's Native SQL Server Driver for PHP (Bug #57055 - Patch by Chris Pucci at Microsoft)</li>
</ul>

2
phpBB/language/en/email/admin_welcome_inactive.txt

@@ -10,7 +10,7 @@ Username: {USERNAME}
Board URL: {U_BOARD}
----------------------------
Your account is currently inactive and will need to be approved by an administrator before you can log in. Another email will be sent when this has occured.
Your account is currently inactive and will need to be approved by an administrator before you can log in. Another email will be sent when this has occurred.
Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.