Merge pull request #7646 from joshgowans/patch-1

[civicrm-core.git] / settings / Url.setting.php

diff --git a/settings/Url.setting.php b/settings/Url.setting.php
index aacaa11440054095adb7f2f9cf69f9d0a6bf9af0..886e218beb7337fb0c12ea4cc299492fc3725194 100644 (file)
--- a/settings/Url.setting.php
+++ b/settings/Url.setting.php
@@ -37,6 +37,7 @@
  */
 return array(
   'userFrameworkResourceURL' => array(
+    'bootstrap_comment' => 'This is a boot setting which may be loaded during bootstrap. Defaults are loaded via SettingsBag::getSystemDefaults().',
     'group' => 'url',
     'group_name' => 'URL Preferences',
     'name' => 'userFrameworkResourceURL',
@@ -50,9 +51,10 @@ return array(
     'is_contact' => 0,
     'description' => 'Absolute URL of the location where the civicrm module or component has been installed.',
     'help_text' => NULL,
-    'validate_callback' => 'CRM_Utils_Rule::url',
+    'validate_callback' => 'CRM_Utils_Rule::urlish',
   ),
   'imageUploadURL' => array(
+    'bootstrap_comment' => 'This is a boot setting which may be loaded during bootstrap. Defaults are loaded via SettingsBag::getSystemDefaults().',
     'group' => 'url',
     'group_name' => 'URL Preferences',
     'title' => 'Image Upload URL',
@@ -66,9 +68,10 @@ return array(
     'is_contact' => 0,
     'description' => 'URL of the location for uploaded image files.',
     'help_text' => NULL,
-    'validate_callback' => 'CRM_Utils_Rule::url',
+    'validate_callback' => 'CRM_Utils_Rule::urlish',
   ),
   'customCSSURL' => array(
+    'bootstrap_comment' => 'This is a boot setting which may be loaded during bootstrap. Defaults are loaded via SettingsBag::getSystemDefaults().',
     'group' => 'url',
     'group_name' => 'URL Preferences',
     'name' => 'customCSSURL',
@@ -82,9 +85,10 @@ return array(
     'is_contact' => 0,
     'description' => 'You can modify the look and feel of CiviCRM by adding your own stylesheet. For small to medium sized modifications, use your css file to override some of the styles in civicrm.css. Or if you need to make drastic changes, you can choose to disable civicrm.css completely.',
     'help_text' => NULL,
-    'validate_callback' => 'CRM_Utils_Rule::url',
+    'validate_callback' => 'CRM_Utils_Rule::urlish',
   ),
   'extensionsURL' => array(
+    'bootstrap_comment' => 'This is a boot setting which may be loaded during bootstrap. Defaults are loaded via SettingsBag::getSystemDefaults().',
     'group' => 'url',
     'group_name' => 'URL Preferences',
     'title' => 'Extension Resource URL',
@@ -98,6 +102,6 @@ return array(
     'is_contact' => 0,
     'description' => 'Base URL for extension resources (images, stylesheets, etc). This should match extensionsDir.',
     'help_text' => NULL,
-    'validate_callback' => 'CRM_Utils_Rule::url',
+    'validate_callback' => 'CRM_Utils_Rule::urlish',
   ),
 );