Merge "Type hint against LinkTarget in WatchedItemStore"

[lhc/web/wiklou.git] / includes / htmlform / fields / HTMLNamespacesMultiselectField.php

diff --git a/includes/htmlform/fields/HTMLNamespacesMultiselectField.php b/includes/htmlform/fields/HTMLNamespacesMultiselectField.php
index 5eab605..860a351 100644 (file)
--- a/includes/htmlform/fields/HTMLNamespacesMultiselectField.php
+++ b/includes/htmlform/fields/HTMLNamespacesMultiselectField.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\Widget\NamespacesMultiselectWidget;
+use MediaWiki\MediaWikiServices;
 
 /**
  * Implements a tag multiselect input field for namespaces.
@@ -27,7 +28,7 @@ class HTMLNamespacesMultiselectField extends HTMLSelectNamespace {
        }
 
        public function validate( $value, $alldata ) {
-               if ( !$this->mParams['exists'] ) {
+               if ( !$this->mParams['exists'] || $value === '' ) {
                        return true;
                }
 
@@ -43,7 +44,10 @@ class HTMLNamespacesMultiselectField extends HTMLSelectNamespace {
                }
 
                foreach ( $namespaces as $namespace ) {
-                       if ( $namespace < 0 ) {
+                       if (
+                               $namespace < 0 ||
+                               !MediaWikiServices::getInstance()->getNamespaceInfo()->exists( $namespace )
+                       ) {
                                return $this->msg( 'htmlform-select-badoption' );
                        }