From af8882e9736356820db8e6a59f68a362cca313b2 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Sat, 4 Dec 2010 01:52:15 +0000
Subject: [PATCH] #978050 by swentel: Fixed Clearing the log with a filter
throws notice and a PDOException
---
modules/dblog/dblog.admin.inc | 1 +
modules/dblog/dblog.test | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/modules/dblog/dblog.admin.inc b/modules/dblog/dblog.admin.inc
index 26b0b50c1e91..53ae7a0abd9c 100644
--- a/modules/dblog/dblog.admin.inc
+++ b/modules/dblog/dblog.admin.inc
@@ -376,6 +376,7 @@ function dblog_clear_log_form($form) {
* Submit callback: clear database with log messages.
*/
function dblog_clear_log_submit() {
+ $_SESSION['dblog_overview_filter'] = array();
db_delete('watchdog')->execute();
drupal_set_message(t('Database log cleared.'));
}
diff --git a/modules/dblog/dblog.test b/modules/dblog/dblog.test
index ab4de77397be..19cf0f448735 100644
--- a/modules/dblog/dblog.test
+++ b/modules/dblog/dblog.test
@@ -467,6 +467,10 @@ class DBLogTestCase extends DrupalWebTestCase {
$count = $this->getTypeCount($types);
$this->assertEqual(array_sum($count), $type['count'], 'Count matched');
}
+
+ // Clear all logs and make sure the confirmation message is found.
+ $this->drupalPost('admin/reports/dblog', array(), t('Clear log messages'));
+ $this->assertText(t('Database log cleared.'), t('Confirmation message found'));
}
/**
--
GitLab