From c1a2145a541222d846143798c3f9ab3293292534 Mon Sep 17 00:00:00 2001 From: eileen Date: Thu, 1 Nov 2018 20:26:18 +1300 Subject: [PATCH] Update casing on setting metadata for html_type = text We have conventionally 'preferred' quick_form_type but we we not 'prefer' the more generic html_type. We are fixing the places where the casing is inconsistent to support this --- settings/Core.setting.php | 16 ++++++++-------- settings/Directory.setting.php | 12 ++++++------ settings/Extension.setting.php | 2 +- settings/Search.setting.php | 2 +- settings/Url.setting.php | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/settings/Core.setting.php b/settings/Core.setting.php index aaf1fcef20..a7a46101b7 100644 --- a/settings/Core.setting.php +++ b/settings/Core.setting.php @@ -492,7 +492,7 @@ return array( 'size' => 64, 'maxlength' => 256, ), - 'html_type' => 'Text', + 'html_type' => 'text', 'default' => NULL, 'add' => '4.3', 'title' => ts('Path to wkhtmltopdf executable'), @@ -511,7 +511,7 @@ return array( 'size' => 64, 'maxlength' => 64, ), - 'html_type' => 'Text', + 'html_type' => 'text', 'default' => NULL, 'add' => '4.3', 'title' => ts('Recaptcha Options'), @@ -530,7 +530,7 @@ return array( 'size' => 64, 'maxlength' => 64, ), - 'html_type' => 'Text', + 'html_type' => 'text', 'default' => NULL, 'add' => '4.3', 'title' => ts('Recaptcha Site Key'), @@ -564,7 +564,7 @@ return array( 'size' => 64, 'maxlength' => 64, ), - 'html_type' => 'Text', + 'html_type' => 'text', 'default' => NULL, 'add' => '4.3', 'title' => ts('Recaptcha Secret Key'), @@ -583,7 +583,7 @@ return array( 'size' => 2, 'maxlength' => 8, ), - 'html_type' => 'Text', + 'html_type' => 'text', 'default' => 7, 'add' => '4.3', 'title' => ts('Checksum Lifespan'), @@ -602,7 +602,7 @@ return array( 'size' => 64, 'maxlength' => 128, ), - 'html_type' => 'Text', + 'html_type' => 'text', 'default' => '*default*', 'add' => '4.3', 'title' => ts('Blog Feed URL'), @@ -621,7 +621,7 @@ return array( 'size' => 64, 'maxlength' => 128, ), - 'html_type' => 'Text', + 'html_type' => 'text', 'default' => '*default*', 'add' => '4.3', 'title' => ts('Community Messages URL'), @@ -640,7 +640,7 @@ return array( 'size' => 64, 'maxlength' => 128, ), - 'html_type' => 'Text', + 'html_type' => 'text', 'default' => '*default*', 'add' => '4.3', 'title' => ts('Getting Started URL'), diff --git a/settings/Directory.setting.php b/settings/Directory.setting.php index c8fce022cd..272e16b6d8 100644 --- a/settings/Directory.setting.php +++ b/settings/Directory.setting.php @@ -43,7 +43,7 @@ return array( 'group' => 'directory', 'name' => 'uploadDir', 'type' => 'String', - 'html_type' => 'Text', + 'html_type' => 'text', 'quick_form_type' => 'Element', 'default' => NULL, 'add' => '4.1', @@ -59,7 +59,7 @@ return array( 'group' => 'directory', 'name' => 'imageUploadDir', 'type' => 'String', - 'html_type' => 'Text', + 'html_type' => 'text', 'quick_form_type' => 'Element', 'default' => NULL, 'add' => '4.1', @@ -75,7 +75,7 @@ return array( 'group' => 'directory', 'name' => 'customFileUploadDir', 'type' => 'String', - 'html_type' => 'Text', + 'html_type' => 'text', 'quick_form_type' => 'Element', 'default' => NULL, 'add' => '4.1', @@ -91,7 +91,7 @@ return array( 'group' => 'directory', 'name' => 'customTemplateDir', 'type' => 'String', - 'html_type' => 'Text', + 'html_type' => 'text', 'quick_form_type' => 'Element', 'default' => NULL, 'add' => '4.1', @@ -107,7 +107,7 @@ return array( 'group' => 'directory', 'name' => 'customPHPPathDir', 'type' => 'String', - 'html_type' => 'Text', + 'html_type' => 'text', 'quick_form_type' => 'Element', 'default' => NULL, 'add' => '4.1', @@ -123,7 +123,7 @@ return array( 'group' => 'directory', 'name' => 'extensionsDir', 'type' => 'String', - 'html_type' => 'Text', + 'html_type' => 'text', 'quick_form_type' => 'Element', 'default' => NULL, 'add' => '4.1', diff --git a/settings/Extension.setting.php b/settings/Extension.setting.php index 75b1581a58..bf3cefc682 100644 --- a/settings/Extension.setting.php +++ b/settings/Extension.setting.php @@ -46,7 +46,7 @@ return array( 'size' => 64, 'maxlength' => 128, ), - 'html_type' => 'Text', + 'html_type' => 'text', 'default' => 'https://civicrm.org/extdir/ver={ver}|cms={uf}', 'add' => '4.3', 'title' => 'Extension Repo URL', diff --git a/settings/Search.setting.php b/settings/Search.setting.php index 0f805195e1..83032fc55d 100644 --- a/settings/Search.setting.php +++ b/settings/Search.setting.php @@ -82,7 +82,7 @@ return array( 'size' => 64, 'maxlength' => 64, ), - 'html_type' => 'Text', + 'html_type' => 'text', 'default' => 'simple', 'add' => '4.5', 'title' => 'How to handle full-tet queries', diff --git a/settings/Url.setting.php b/settings/Url.setting.php index f5c43bc610..21af324047 100644 --- a/settings/Url.setting.php +++ b/settings/Url.setting.php @@ -43,7 +43,7 @@ return array( 'name' => 'userFrameworkResourceURL', 'title' => 'CiviCRM Resource URL', 'type' => 'String', - 'html_type' => 'Text', + 'html_type' => 'text', 'quick_form_type' => 'Element', 'default' => NULL, 'add' => '4.1', @@ -60,7 +60,7 @@ return array( 'title' => 'Image Upload URL', 'name' => 'imageUploadURL', 'type' => 'String', - 'html_type' => 'Text', + 'html_type' => 'text', 'quick_form_type' => 'Element', 'default' => NULL, 'add' => '4.1', @@ -77,7 +77,7 @@ return array( 'name' => 'customCSSURL', 'title' => 'Custom CSS URL', 'type' => 'String', - 'html_type' => 'Text', + 'html_type' => 'text', 'quick_form_type' => 'Element', 'default' => NULL, 'add' => '4.1', @@ -94,7 +94,7 @@ return array( 'title' => 'Extension Resource URL', 'name' => 'extensionsURL', 'type' => 'String', - 'html_type' => 'Text', + 'html_type' => 'text', 'quick_form_type' => 'Element', 'default' => NULL, 'add' => '4.1', -- 2.25.1