From 0b2bdd13e190523e68f8ee762b825eaa0a801e4b Mon Sep 17 00:00:00 2001 From: JKingsnorth Date: Wed, 18 Feb 2015 09:39:55 +0000 Subject: [PATCH] Update debugging page text --- api/v3/examples/Setting/GetFields.php | 22 +++++++++---------- settings/Developer.setting.php | 22 +++++++++---------- .../CRM/Admin/Form/Setting/Debugging.tpl | 14 ++++++------ 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/api/v3/examples/Setting/GetFields.php b/api/v3/examples/Setting/GetFields.php index b08a94cacd..9c9cabb8f6 100644 --- a/api/v3/examples/Setting/GetFields.php +++ b/api/v3/examples/Setting/GetFields.php @@ -902,36 +902,36 @@ function setting_getfields_expectedresult() { 'description' => 'When enabled, \"empowered by CiviCRM\" is displayed at the bottom of public forms.', 'help_text' => '', ), - 'debug_enabled' => array( + 'userFrameworkLogging' => array( 'group_name' => 'Developer Preferences', 'group' => 'developer', - 'name' => 'debug_enabled', - 'config_key' => 'debug', + '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', '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', diff --git a/settings/Developer.setting.php b/settings/Developer.setting.php index 988159834f..23861d0f8f 100644 --- a/settings/Developer.setting.php +++ b/settings/Developer.setting.php @@ -37,36 +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', diff --git a/templates/CRM/Admin/Form/Setting/Debugging.tpl b/templates/CRM/Admin/Form/Setting/Debugging.tpl index 861bbe6f39..881884d53d 100644 --- a/templates/CRM/Admin/Form/Setting/Debugging.tpl +++ b/templates/CRM/Admin/Form/Setting/Debugging.tpl @@ -29,22 +29,22 @@
{include file="CRM/common/formButtons.tpl" location="top"}
- - - - {if $form.userFrameworkLogging} + {ts}Set this value to Yes if you want CiviCRM error/debugging messages to appear in the Drupal error logs{/ts} {help id='userFrameworkLogging'} {/if} + + + + + {ts}This feature should NOT be enabled for production sites.
Set this value to Yes if you want to display a backtrace listing when a fatal error is encountered.{/ts} -- 2.25.1
{$form.debug_enabled.label}{$form.debug_enabled.html}
- {ts}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{/ts} {help id='debug'}
{$form.userFrameworkLogging.label} {$form.userFrameworkLogging.html}
- {ts}Set this value to Yes if you want CiviCRM error/debugging messages to also appear in Drupal error logs{/ts} {help id='userFrameworkLogging'}
{$form.debug_enabled.label}{$form.debug_enabled.html}
+ {ts}This feature should NOT be enabled for production sites.
Set this value to Yes if you want to use one of CiviCRM's debugging tools.{/ts} {help id='debug'}
{$form.backtrace.label} {$form.backtrace.html}
- {ts}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{/ts}
{$form.fatalErrorTemplate.label}