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

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

diff --git a/includes/htmlform/fields/HTMLTagFilter.php b/includes/htmlform/fields/HTMLTagFilter.php
index e24541c..38f9a0a 100644 (file)
--- a/includes/htmlform/fields/HTMLTagFilter.php
+++ b/includes/htmlform/fields/HTMLTagFilter.php
@@ -6,7 +6,8 @@ class HTMLTagFilter extends HTMLFormField {
        protected $tagFilter;
 
        public function getTableRow( $value ) {
-               $this->tagFilter = ChangeTags::buildTagFilterSelector( $value );
+               $this->tagFilter = ChangeTags::buildTagFilterSelector(
+                       $value, false, $this->mParent->getContext() );
                if ( $this->tagFilter ) {
                        return parent::getTableRow( $value );
                }
@@ -14,13 +15,23 @@ class HTMLTagFilter extends HTMLFormField {
        }
 
        public function getDiv( $value ) {
-               $this->tagFilter = ChangeTags::buildTagFilterSelector( $value );
+               $this->tagFilter = ChangeTags::buildTagFilterSelector(
+                       $value, false, $this->mParent->getContext() );
                if ( $this->tagFilter ) {
                        return parent::getDiv( $value );
                }
                return '';
        }
 
+       public function getOOUI( $value ) {
+               $this->tagFilter = ChangeTags::buildTagFilterSelector(
+                       $value, true, $this->mParent->getContext() );
+               if ( $this->tagFilter ) {
+                       return parent::getOOUI( $value );
+               }
+               return new OOUI\FieldLayout( new OOUI\Widget() );
+       }
+
        public function getInputHTML( $value ) {
                if ( $this->tagFilter ) {
                        // we only need the select field, HTMLForm should handle the label
@@ -28,4 +39,12 @@ class HTMLTagFilter extends HTMLFormField {
                }
                return '';
        }
+
+       public function getInputOOUI( $value ) {
+               if ( $this->tagFilter ) {
+                       // we only need the select field, HTMLForm should handle the label
+                       return $this->tagFilter[1];
+               }
+               return '';
+       }
 }