Followup to r50744: Actually declare the method as public static, and use it in the API

diff --git a/includes/api/ApiBlock.php b/includes/api/ApiBlock.php
index acfd39e..9220d54 100644 (file)
--- a/includes/api/ApiBlock.php
+++ b/includes/api/ApiBlock.php
@@ -49,7 +49,7 @@ class ApiBlock extends ApiBase {
         * of success. If it fails, the result will specify the nature of the error.
         */
        public function execute() {
-               global $wgUser, $wgBlockAllowsUTEdit, $wgEnableUserEmail, $wgSysopEmailBans;
+               global $wgUser, $wgBlockAllowsUTEdit;
                $params = $this->extractRequestParams();
 
                if($params['gettoken'])
@@ -69,7 +69,7 @@ class ApiBlock extends ApiBase {
                        $this->dieUsageMsg(array('cantblock'));
                if($params['hidename'] && !$wgUser->isAllowed('hideuser'))
                        $this->dieUsageMsg(array('canthide'));
-               if($params['noemail'] && $wgEnableUserEmail && $wgSysopEmailBans && !$wgUser->isAllowed('blockemail'))
+               if($params['noemail'] && !IPBlockForm::canBlockEmail($wgUser) )
                        $this->dieUsageMsg(array('cantblock-email'));
 
                $form = new IPBlockForm('');

diff --git a/includes/specials/SpecialBlockip.php b/includes/specials/SpecialBlockip.php
index 9d5dd29..58547a2 100644 (file)
--- a/includes/specials/SpecialBlockip.php
+++ b/includes/specials/SpecialBlockip.php
@@ -319,7 +319,7 @@ class IPBlockForm {
         * @param User $user The sysop wanting to make a block
         * @return boolean
         */
-       protected function canBlockEmail( $user ) {
+       public static function canBlockEmail( $user ) {
                global $wgEnableUserEmail, $wgSysopEmailBans;
                return ($wgEnableUserEmail && $wgSysopEmailBans && $user->isAllowed( 'blockemail' ));
        }