From 8f0551201883036cac63d720149953c007d4f10d Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Mon, 23 Jun 2014 11:35:02 +1200 Subject: [PATCH] CRM-14850 fix admin form to support change from config to setting --- CRM/Admin/Form/Setting/Debugging.php | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/CRM/Admin/Form/Setting/Debugging.php b/CRM/Admin/Form/Setting/Debugging.php index 575a65159c..8871033a8e 100644 --- a/CRM/Admin/Form/Setting/Debugging.php +++ b/CRM/Admin/Form/Setting/Debugging.php @@ -39,6 +39,12 @@ */ class CRM_Admin_Form_Setting_Debugging extends CRM_Admin_Form_Setting { + protected $_settings = array( + 'debug_enabled' => CRM_Core_BAO_Setting::DIRECTORY_PREFERENCES_NAME, + 'backtrace' => CRM_Core_BAO_Setting::DIRECTORY_PREFERENCES_NAME, + 'fatalErrorTemplate' => CRM_Core_BAO_Setting::DIRECTORY_PREFERENCES_NAME, + 'fatalErrorHandler' => CRM_Core_BAO_Setting::DIRECTORY_PREFERENCES_NAME, + ); /** * Function to build the form * @@ -47,16 +53,9 @@ class CRM_Admin_Form_Setting_Debugging extends CRM_Admin_Form_Setting { */ public function buildQuickForm() { CRM_Utils_System::setTitle(ts(' Settings - Debugging and Error Handling ')); - - $config = CRM_Core_Config::singleton(); - - $this->addYesNo('debug', ts('Enable Debugging')); - if ($config->userSystem->is_drupal == '1') { - $this->addYesNo('userFrameworkLogging', ts('Enable Drupal Watchdog Logging')); + if (CRM_Core_Config::singleton()->userSystem->supports_UF_Logging == '1') { + $this->_settings['userFrameworkLogging'] = CRM_Core_BAO_Setting::DIRECTORY_PREFERENCES_NAME; } - $this->addYesNo('backtrace', ts('Display Backtrace')); - $this->addElement('text', 'fatalErrorTemplate', ts('Fatal Error Template')); - $this->addElement('text', 'fatalErrorHandler', ts('Fatal Error Handler')); parent::buildQuickForm(); } -- 2.25.1