Merge "Skin: Make skins aware of their registered skin name"

[lhc/web/wiklou.git] / includes / api / ApiEmailUser.php

diff --git a/includes/api/ApiEmailUser.php b/includes/api/ApiEmailUser.php
index 72c7c35..edea266 100644 (file)
--- a/includes/api/ApiEmailUser.php
+++ b/includes/api/ApiEmailUser.php
@@ -34,7 +34,7 @@ class ApiEmailUser extends ApiBase {
                $params = $this->extractRequestParams();
 
                // Validate target
-               $targetUser = SpecialEmailUser::getTarget( $params['target'] );
+               $targetUser = SpecialEmailUser::getTarget( $params['target'], $this->getUser() );
                if ( !( $targetUser instanceof User ) ) {
                        switch ( $targetUser ) {
                                case 'notarget':
@@ -71,7 +71,7 @@ class ApiEmailUser extends ApiBase {
                }
 
                $result = array_filter( [
-                       'result' => $retval->isGood() ? 'Success' : $retval->isOk() ? 'Warnings' : 'Failure',
+                       'result' => $retval->isGood() ? 'Success' : ( $retval->isOk() ? 'Warnings' : 'Failure' ),
                        'warnings' => $this->getErrorFormatter()->arrayFromStatus( $retval, 'warning' ),
                        'errors' => $this->getErrorFormatter()->arrayFromStatus( $retval, 'error' ),
                ] );