Update debugging page text

diff --git a/api/v3/examples/Setting/GetFields.php b/api/v3/examples/Setting/GetFields.php
index b08a94cacde9f50c1a58efa8e594c2249c977283..9c9cabb8f645aca551bc5cf1a084d8ec6c3820b6 100644 (file)
--- 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 988159834ffea93a11581e1c0f46facfb2d824a4..23861d0f8fc3668165c0443f463b94291684e91a 100644 (file)
--- 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 861bbe6f39f8f3d83829c6bd21908bf52522f9fa..881884d53d0e233c4215f956fb5c5ee14737c7c7 100644 (file)
--- a/templates/CRM/Admin/Form/Setting/Debugging.tpl
+++ b/templates/CRM/Admin/Form/Setting/Debugging.tpl
@@ -29,22 +29,22 @@
 </div>
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
          <table class="form-layout">
-            <tr class="crm-debugging-form-block-debug">
-                <td class="label">{$form.debug_enabled.label}</td>
-                <td>{$form.debug_enabled.html}<br />
-                <span class="description">{ts}Set this value to <strong>Yes</strong> if you want to use one of CiviCRM's debugging tools. <strong>This feature should NOT be enabled for production sites</strong>{/ts} {help id='debug'}</span></td>
-            </tr>
             {if $form.userFrameworkLogging}
             <tr class="crm-debugging-form-block-userFrameworkLogging">
                 <td class="label">{$form.userFrameworkLogging.label}</td>
                 <td>{$form.userFrameworkLogging.html}<br />
-                <span class="description">{ts}Set this value to <strong>Yes</strong> if you want CiviCRM error/debugging messages to also appear in Drupal error logs{/ts} {help id='userFrameworkLogging'}</span></td>
+                <span class="description">{ts}Set this value to <strong>Yes</strong> if you want CiviCRM error/debugging messages to appear in the Drupal error logs{/ts} {help id='userFrameworkLogging'}</span></td>
             </tr>
             {/if}
+            <tr class="crm-debugging-form-block-debug">
+                <td class="label">{$form.debug_enabled.label}</td>
+                <td>{$form.debug_enabled.html}<br />
+                <span class="description">{ts}<strong>This feature should NOT be enabled for production sites.</strong><br />Set this value to <strong>Yes</strong> if you want to use one of CiviCRM's debugging tools.{/ts} {help id='debug'}</span></td>
+            </tr>
             <tr class="crm-debugging-form-block-backtrace">
                 <td class="label">{$form.backtrace.label}</td>
                 <td>{$form.backtrace.html}<br />
-                <span class="description">{ts}Set this value to <strong>Yes</strong> if you want to display a backtrace listing when a fatal error is encountered. <strong>This feature should NOT be enabled for production sites</strong>{/ts}</span></td>
+                <span class="description">{ts}<strong>This feature should NOT be enabled for production sites.</strong><br />Set this value to <strong>Yes</strong> if you want to display a backtrace listing when a fatal error is encountered.{/ts}</span></td>
             </tr>
             <tr class="crm-debugging-form-block-fatalErrorTemplate">
                 <td class="label">{$form.fatalErrorTemplate.label}</td>