Merge pull request #4906 from eileenmcnaughton/minor-tidies

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

diff --git a/settings/Directory.setting.php b/settings/Directory.setting.php
index f0ba60e6e0fdc69f1aaba8b15f3ef4404155c73a..85249c63f35b0e553e91e7afe1639dc971f841a6 100644 (file)
--- a/settings/Directory.setting.php
+++ b/settings/Directory.setting.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -43,14 +43,14 @@ return array(
     'name' => 'uploadDir',
     'type' => 'Url',
     'html_type' => 'Text',
-    'default' => null,
+    'default' => NULL,
     'add' => '4.1',
     'prefetch' => 1,
-    'title' => null,
+    'title' => 'Upload Directory',
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => null,
-    'help_text' => 'If set, new contacts that are created when signing a petition are assigned a tag of this name.',
+    'description' => NULL,
+    'help_text' => '',
   ),
   'imageUploadDir' => array(
     'group_name' => 'Directory Preferences',
@@ -58,14 +58,14 @@ return array(
     'name' => 'imageUploadDir',
     'type' => 'Url',
     'html_type' => 'Text',
-    'default' => null,
+    'default' => NULL,
     'add' => '4.1',
     'prefetch' => 1,
-    'title' => null,
+    'title' => 'Image Directory',
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => null,
-    'help_text' => null,
+    'description' => NULL,
+    'help_text' => NULL,
   ),
   'customFileUploadDir' => array(
     'group_name' => 'Directory Preferences',
@@ -73,14 +73,14 @@ return array(
     'name' => 'customFileUploadDir',
     'type' => 'Url',
     'html_type' => 'Text',
-    'default' => null,
+    'default' => NULL,
     'add' => '4.1',
     'prefetch' => 1,
-    'title' => null,
+    'title' => 'Custom Files Upload Directory',
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => null,
-    'help_text' => null,
+    'description' => NULL,
+    'help_text' => NULL,
   ),
   'customTemplateDir' => array(
     'group_name' => 'Directory Preferences',
@@ -88,14 +88,14 @@ return array(
     'name' => 'customTemplateDir',
     'type' => 'Url',
     'html_type' => 'Text',
-    'default' => null,
+    'default' => NULL,
     'add' => '4.1',
     'prefetch' => 1,
-    'title' => null,
+    'title' => 'Custom Template Directory',
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => null,
-    'help_text' => null,
+    'description' => NULL,
+    'help_text' => NULL,
   ),
   'customPHPPathDir' => array(
     'group_name' => 'Directory Preferences',
@@ -103,14 +103,14 @@ return array(
     'name' => 'customPHPPathDir',
     'type' => 'Url',
     'html_type' => 'Text',
-    'default' => null,
+    'default' => NULL,
     'add' => '4.1',
     'prefetch' => 1,
-    'title' => null,
+    'title' => 'Custom PHP Path',
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => null,
-    'help_text' => null,
+    'description' => NULL,
+    'help_text' => NULL,
   ),
   'extensionsDir' => array(
     'group_name' => 'Directory Preferences',
@@ -118,14 +118,14 @@ return array(
     'name' => 'extensionsDir',
     'type' => 'Url',
     'html_type' => 'Text',
-    'default' => null,
+    'default' => NULL,
     'add' => '4.1',
     'prefetch' => 1,
-    'title' => null,
+    'title' => 'Extensions Directory',
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => null,
-    'help_text' => null,
+    'description' => NULL,
+    'help_text' => NULL,
   ),