Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-12-15-44-44

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

diff --git a/settings/Developer.setting.php b/settings/Developer.setting.php
index 0062ae5108d6db1368143eb9d1184368df189584..e462adeb9577a1fbf4c7509a4bb4d9d566f0df5b 100644 (file)
--- a/settings/Developer.setting.php
+++ b/settings/Developer.setting.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -23,12 +23,12 @@
  | 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-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
  * $Id$
  *
  */
@@ -37,37 +37,36 @@
  */
 
 return array(
-  'debug_enabled' => array(
+  'userFrameworkLogging' => array(
     'group_name' => 'Developer Preferences',
     'group' => 'developer',
-    'name' => 'debug_enabled',
-    'config_key' => 'debug', // we can't call the setting debug as that has other meanings in api
+    'name' => 'userFrameworkLogging',
     'type' => 'Boolean',
     'quick_form_type' => 'YesNo',
     'default' => '0',
     'add' => '4.3',
-    'title' => 'Enable Debugging',
+    'title' => 'Enable Drupal Watchdog Logging',
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => "Set this value to Yes if you want to use one of CiviCRM's debugging tools. This feature should NOT be enabled for production sites",
+    'description' => "Set this value to Yes if you want CiviCRM error/debugging messages to appear in the Drupal error logs",
     'prefetch' => 1,
-    'help_text' => 'Do not turn this on on production sites',
+    'help_text' => "Set this value to Yes if you want CiviCRM error/debugging messages the appear in your CMS' error log. In the case of Drupal, this will cause all CiviCRM error messages to appear in the watchdog (assuming you have Drupal's watchdog enabled)",
   ),
-  'userFrameworkLogging' => array(
+  'debug_enabled' => array(
     'group_name' => 'Developer Preferences',
     'group' => 'developer',
-    'name' => 'userFrameworkLogging',
+    'name' => 'debug_enabled',
+    'config_key' => 'debug', // we can't call the setting debug as that has other meanings in api
     'type' => 'Boolean',
     'quick_form_type' => 'YesNo',
     'default' => '0',
     'add' => '4.3',
-    'title' => 'Enable Drupal Watchdog Logging',
+    'title' => 'Enable Debugging',
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => "Set this value to Yes if you want CiviCRM error/debugging messages to also appear in Drupal error logs",
+    'description' => "Set this value to Yes if you want to use one of CiviCRM's debugging tools. This feature should NOT be enabled for production sites",
     'prefetch' => 1,
-    'help_text' => "Set this value to Yes if you want CiviCRM error/debugging messages the appear in your CMS' error log.
-In the case of Drupal, this will cause all CiviCRM error messages to appear in the watchdog (assuming you have Drupal's watchdog enabled)",
+    'help_text' => 'Do not turn this on on production sites',
   ),
   'backtrace' => array(
     'group_name' => 'Developer Preferences',
@@ -83,21 +82,6 @@ In the case of Drupal, this will cause all CiviCRM error messages to appear in t
     'description' => "Set this value to Yes if you want to display a backtrace listing when a fatal error is encountered. This feature should NOT be enabled for production sites",
     'prefetch' => 1,
   ),
-  'fatalErrorTemplate' => array(
-    'group_name' => 'Developer Preferences',
-    'group' => 'developer',
-    'name' => 'fatalErrorTemplate',
-    'type' => 'String',
-    'quick_form_type' => 'Element',
-    'html_type' => 'text',
-    'default' => 'CRM/common/fatal.tpl',
-    'add' => '4.3',
-    'title' => 'Fatal Error Template',
-    'is_domain' => 1,
-    'is_contact' => 0,
-    'description' => "Enter the path and filename for a custom Smarty template if you want to define your own screen for displaying fatal errors.",
-    'prefetch' => 1,
-  ),
   'fatalErrorHandler' => array(
     'group_name' => 'Developer Preferences',
     'group' => 'developer',
@@ -105,7 +89,7 @@ In the case of Drupal, this will cause all CiviCRM error messages to appear in t
     'type' => 'String',
     'quick_form_type' => 'Element',
     'html_type' => 'text',
-    'default' => null,
+    'default' => NULL,
     'add' => '4.3',
     'title' => 'Fatal Error Handler',
     'is_domain' => 1,