GitInfo: Don't try shelling out if it's disabled

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

diff --git a/includes/htmlform/fields/HTMLFormFieldCloner.php b/includes/htmlform/fields/HTMLFormFieldCloner.php
index dd9184b..dec162f 100644 (file)
--- a/includes/htmlform/fields/HTMLFormFieldCloner.php
+++ b/includes/htmlform/fields/HTMLFormFieldCloner.php
@@ -93,9 +93,9 @@ class HTMLFormFieldCloner extends HTMLFormField {
                                $info['name'] = $name;
                        }
                        if ( isset( $info['id'] ) ) {
-                               $info['id'] = Sanitizer::escapeId( "{$this->mID}--$key--{$info['id']}" );
+                               $info['id'] = Sanitizer::escapeIdForAttribute( "{$this->mID}--$key--{$info['id']}" );
                        } else {
-                               $info['id'] = Sanitizer::escapeId( "{$this->mID}--$key--$fieldname" );
+                               $info['id'] = Sanitizer::escapeIdForAttribute( "{$this->mID}--$key--$fieldname" );
                        }
                        // Copy the hide-if rules to "child" fields, so that the JavaScript code handling them
                        // (resources/src/mediawiki/htmlform/hide-if.js) doesn't have to handle nested fields.
@@ -273,9 +273,7 @@ class HTMLFormFieldCloner extends HTMLFormField {
         * @return string
         */
        protected function getInputHTMLForKey( $key, array $values ) {
-               $displayFormat = isset( $this->mParams['format'] )
-                       ? $this->mParams['format']
-                       : $this->mParent->getDisplayFormat();
+               $displayFormat = $this->mParams['format'] ?? $this->mParent->getDisplayFormat();
 
                // Conveniently, PHP method names are case-insensitive.
                $getFieldHtmlMethod = $displayFormat == 'table' ? 'getTableRow' : ( 'get' . $displayFormat );
@@ -298,7 +296,7 @@ class HTMLFormFieldCloner extends HTMLFormField {
                                $html .= $field->$getFieldHtmlMethod( $v );
 
                                $labelValue = trim( $field->getLabel() );
-                               if ( $labelValue != ' ' && $labelValue !== '' ) {
+                               if ( $labelValue != "\u{00A0}" && $labelValue !== '' ) {
                                        $hasLabel = true;
                                }
                        }
@@ -306,14 +304,12 @@ class HTMLFormFieldCloner extends HTMLFormField {
 
                if ( !isset( $fields['delete'] ) ) {
                        $name = "{$this->mName}[$key][delete]";
-                       $label = isset( $this->mParams['delete-button-message'] )
-                               ? $this->mParams['delete-button-message']
-                               : 'htmlform-cloner-delete';
+                       $label = $this->mParams['delete-button-message'] ?? 'htmlform-cloner-delete';
                        $field = HTMLForm::loadInputFromParameters( $name, [
                                'type' => 'submit',
                                'formnovalidate' => true,
                                'name' => $name,
-                               'id' => Sanitizer::escapeId( "{$this->mID}--$key--delete" ),
+                               'id' => Sanitizer::escapeIdForAttribute( "{$this->mID}--$key--delete" ),
                                'cssclass' => 'mw-htmlform-cloner-delete-button',
                                'default' => $this->getMessage( $label )->text(),
                        ], $this->mParent );
@@ -379,14 +375,12 @@ class HTMLFormFieldCloner extends HTMLFormField {
                ], $html );
 
                $name = "{$this->mName}[create]";
-               $label = isset( $this->mParams['create-button-message'] )
-                       ? $this->mParams['create-button-message']
-                       : 'htmlform-cloner-create';
+               $label = $this->mParams['create-button-message'] ?? 'htmlform-cloner-create';
                $field = HTMLForm::loadInputFromParameters( $name, [
                        'type' => 'submit',
                        'formnovalidate' => true,
                        'name' => $name,
-                       'id' => Sanitizer::escapeId( "{$this->mID}--create" ),
+                       'id' => Sanitizer::escapeIdForAttribute( "{$this->mID}--create" ),
                        'cssclass' => 'mw-htmlform-cloner-create-button',
                        'default' => $this->getMessage( $label )->text(),
                ], $this->mParent );