Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #1838892 by marcingy, TravisCarden: Fixed Fatal error when sorting dblog by type.

8.0.x
webchick 2012-11-26 09:17:27 -08:00
parent fd846046df
commit 951abb89ce
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/dblog/dblog.admin.inc
View File

@ -61,7 +61,7 @@ function dblog_overview() {
$rows[] = array('data' => $rows[] = array('data' =>
array( array(
// Cells // Cells
array('class' => 'icon'), array('class' => array('icon')),
t($dblog->type), t($dblog->type),
format_date($dblog->timestamp, 'short'), format_date($dblog->timestamp, 'short'),
theme('dblog_message', array('event' => $dblog, 'link' => TRUE)), theme('dblog_message', array('event' => $dblog, 'link' => TRUE)),

4
core/modules/dblog/lib/Drupal/dblog/Tests/DBLogTest.php
View File

@ -518,6 +518,10 @@ class DBLogTest extends WebTestBase {
$this->assertEqual(array_sum($count), $type['count'], 'Count matched'); $this->assertEqual(array_sum($count), $type['count'], 'Count matched');
} }
$this->drupalGet('admin/reports/dblog', array('query' => array('order' => 'Type')));
$this->assertResponse(200);
$this->assertText(t('Operations'), 'Operations text found');
// Clear all logs and make sure the confirmation message is found. // Clear all logs and make sure the confirmation message is found.
$this->drupalPost('admin/reports/dblog', array(), t('Clear log messages')); $this->drupalPost('admin/reports/dblog', array(), t('Clear log messages'));
$this->assertText(t('Database log cleared.'), 'Confirmation message found'); $this->assertText(t('Database log cleared.'), 'Confirmation message found');