- Patch #329015 by Damien Tournoud: improved error handling of batch API.

2 files changed, 7 insertions, 7 deletions

diff --git a/modules/simpletest/tests/common.test b/modules/simpletest/tests/common.test
index 735360eb8..4f58cdfa7 100644
--- a/modules/simpletest/tests/common.test
+++ b/modules/simpletest/tests/common.test
@@ -672,21 +672,21 @@ class DrupalErrorHandlerUnitTest extends DrupalWebTestCase {
     );
 
     // Set error reporting to collect notices.
-    variable_set('error_level', 2);
+    variable_set('error_level', ERROR_REPORTING_DISPLAY_ALL);
     $this->drupalGet('system-test/generate-warnings');
     $this->assertErrorMessage($error_notice);
     $this->assertErrorMessage($error_warning);
     $this->assertErrorMessage($error_user_notice);
 
     // Set error reporting to not collect notices.
-    variable_set('error_level', 1);
+    variable_set('error_level', ERROR_REPORTING_DISPLAY_SOME);
     $this->drupalGet('system-test/generate-warnings');
     $this->assertNoErrorMessage($error_notice);
     $this->assertErrorMessage($error_warning);
     $this->assertErrorMessage($error_user_notice);
 
     // Set error reporting to not show any errors.
-    variable_set('error_level', 0);
+    variable_set('error_level', ERROR_REPORTING_HIDE);
     $this->drupalGet('system-test/generate-warnings');
     $this->assertNoErrorMessage($error_notice);
     $this->assertNoErrorMessage($error_warning);
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index fac8ab919..3d4b38f40 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -1268,11 +1268,11 @@ function system_logging_settings() {
   $form['error_level'] = array(
     '#type' => 'radios',
     '#title' => t('Display PHP messages'),
-    '#default_value' => 2,
+    '#default_value' => ERROR_REPORTING_DISPLAY_ALL,
     '#options' => array(
-      0 => t('None'),
-      1 => t('Errors and warnings'),
-      2 => t('All messages'),
+      ERROR_REPORTING_HIDE => t('None'),
+      ERROR_REPORTING_DISPLAY_SOME => t('Errors and warnings'),
+      ERROR_REPORTING_DISPLAY_ALL => t('All messages'),
     ),
   );