Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-02-02-18-36-16

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

diff --git a/settings/Url.setting.php b/settings/Url.setting.php
index d390d4a8b7b23abbc61c031af7bd3316a023d708..eb8b33b25f972ffcc8f6ac78a96f8c02cee46013 100644 (file)
--- a/settings/Url.setting.php
+++ b/settings/Url.setting.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -23,59 +23,62 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
 /*
  * Settings metadata file
  */
-return array (
+return array(
   'userFrameworkResourceURL' => array(
     'group' => 'url',
     'group_name' => 'URL Preferences',
     'name' => 'userFrameworkResourceURL',
+    'title' => 'Script and CSS Resources URL',
     'type' => 'String',
-    'default' => null,
+    'default' => NULL,
     'add' => '4.1',
     'prefetch' => 1,
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => 'CiviCRM Resource URL',
-    'help_text' => null,
+    'help_text' => NULL,
     'validate_callback' => 'CRM_Utils_Rule::url',
   ),
   'imageUploadURL' => array(
     'group' => 'url',
     'group_name' => 'URL Preferences',
+    'title' => 'Image URL Prefix',
     'name' => 'imageUploadURL',
     'type' => 'String',
-    'default' => null,
+    'default' => NULL,
     'add' => '4.1',
     'prefetch' => 1,
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => 'Image Upload URL',
-    'help_text' => null,
+    'help_text' => NULL,
     'validate_callback' => 'CRM_Utils_Rule::url',
   ),
   'customCSSURL' => array(
     'group' => 'url',
     'group_name' => 'URL Preferences',
     'name' => 'customCSSURL',
+    'title' => 'Custom CSS',
     'type' => 'String',
-    'default' => null,
+    'default' => NULL,
     'add' => '4.1',
     'prefetch' => 1,
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => 'Custom CiviCRM CSS URL',
-    'help_text' => null,
+    'help_text' => NULL,
     'validate_callback' => 'CRM_Utils_Rule::url',
   ),