7 files changed, 17 insertions, 9 deletions
diff --git a/modules/dblog/dblog-rtl.css b/modules/dblog/dblog-rtl.css
index d9152dfbf..282fe971d 100644
--- a/modules/dblog/dblog-rtl.css
+++ b/modules/dblog/dblog-rtl.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 
 .form-item-type,
 .form-item-severity {
diff --git a/modules/dblog/dblog.admin.inc b/modules/dblog/dblog.admin.inc
index 53ae7a0ab..947100daa 100644
--- a/modules/dblog/dblog.admin.inc
+++ b/modules/dblog/dblog.admin.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
@@ -286,7 +285,7 @@ function dblog_filter_form($form) {
     '#type' => 'fieldset',
     '#title' => t('Filter log messages'),
     '#collapsible' => TRUE,
-    '#collapsed' => empty($session),
+    '#collapsed' => empty($_SESSION['dblog_overview_filter']),
   );
   foreach ($filters as $key => $filter) {
     $form['filters']['status'][$key] = array(
diff --git a/modules/dblog/dblog.css b/modules/dblog/dblog.css
index 1b7e8352c..ff310e3ba 100644
--- a/modules/dblog/dblog.css
+++ b/modules/dblog/dblog.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 
 .form-item-type,
 .form-item-severity {
diff --git a/modules/dblog/dblog.info b/modules/dblog/dblog.info
index 35b01489a..608bdd726 100644
--- a/modules/dblog/dblog.info
+++ b/modules/dblog/dblog.info
@@ -1,4 +1,3 @@
-; $Id$
 name = Database logging
 description = Logs and records system events to the database.
 package = Core
diff --git a/modules/dblog/dblog.install b/modules/dblog/dblog.install
index bb56903a9..759c7bc1a 100644
--- a/modules/dblog/dblog.install
+++ b/modules/dblog/dblog.install
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
@@ -93,6 +92,13 @@ function dblog_schema() {
 }
 
 /**
+ * Implements hook_uninstall().
+ */
+function dblog_uninstall() {
+  variable_del('dblog_row_limit');
+}
+
+/**
  * @addtogroup updates-6.x-to-7.x
  * @{
  */
diff --git a/modules/dblog/dblog.module b/modules/dblog/dblog.module
index 590844786..496a043a7 100644
--- a/modules/dblog/dblog.module
+++ b/modules/dblog/dblog.module
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
@@ -139,9 +138,12 @@ function _dblog_get_message_types() {
  * Note some values may be truncated for database column size restrictions.
  */
 function dblog_watchdog(array $log_entry) {
+  // The user object may not exist in all conditions, so 0 is substituted if needed.
+  $user_uid = isset($log_entry['user']->uid) ? $log_entry['user']->uid : 0;
+
   Database::getConnection('default', 'default')->insert('watchdog')
     ->fields(array(
-      'uid' => $log_entry['user']->uid,
+      'uid' => $user_uid,
       'type' => substr($log_entry['type'], 0, 64),
       'message' => $log_entry['message'],
       'variables' => serialize($log_entry['variables']),
diff --git a/modules/dblog/dblog.test b/modules/dblog/dblog.test
index 19cf0f448..5717455ef 100644
--- a/modules/dblog/dblog.test
+++ b/modules/dblog/dblog.test
@@ -1,5 +1,9 @@
 <?php
-// $Id$
+
+/**
+ * @file
+ * Tests for dblog.module.
+ */
 
 class DBLogTestCase extends DrupalWebTestCase {
   protected $big_user;