scratchfoundation/swiki-confirmaccount
1
0
Fork 0
mirror of https://github.com/scratchfoundation/swiki-confirmaccount.git synced 2024-12-04 12:51:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

proper counting of requests in RC

Browse source
This commit is contained in:
Jacob G 2015-01-15 21:09:25 -05:00
parent 2f103ae972
commit d2fd954b97
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ConfirmAccount/business/AccountConfirmSubmission.php
View file

@ -446,7 +446,7 @@ class AccountConfirmSubmission {
global $wgAutoWelcomeNewUsers;
if ( $wgAutoWelcomeNewUsers ) {
if ($this->reason == '') {
if (trim($this->reason) == '') {
$msg = "confirmaccount-welc-pos{$this->type}";
$welcome = wfEmptyMsg( $msg )
? wfMessage( 'confirmaccount-welc' )->text()

4
ConfirmAccount/frontend/ConfirmAccountUI.hooks.php
View file

@ -65,10 +65,10 @@ class ConfirmAccountUIHooks {
return true;
}
$count = ConfirmAccount::getOpenRequestCount( '*' );
if ( $count > 0 ) {
if ( sizeof($count['open']) > 0 ) {
$out->prependHtml(
'<div id="mw-confirmaccount-msg" class="plainlinks mw-confirmaccount-bar">' .
$context->msg( 'confirmaccount-newrequests' )->numParams( $count )->parse() .
$context->msg( 'confirmaccount-newrequests' )->numParams( $count['open'] )->parse() .
'</div>'
);

4
ConfirmAccount/frontend/language/ConfirmAccountPage.i18n.php
View file

@ -28,10 +28,6 @@ They can still be approved into accounts.',
'confirmaccount-text' => 'This is a pending request for a user account at \'\'\'{{SITENAME}}\'\'\'.
Carefully review the below information.
If you are approving this request, use the position dropdown to set the account status of the user.
Edits made to the application biography will not affect any permanent credential storage.
Note that you can choose to create the account under a different username.
Use this only to avoid collisions with other names.
If you simply leave this page without confirming or denying this request, it will remain pending.',
'confirmaccount-none-o' => 'There are currently no open pending account requests in this list.',