diff options
| author | webchick <webchick@24967.no-reply.drupal.org> | 2012-04-28 23:42:56 -0700 |
|---|---|---|
| committer | webchick <webchick@24967.no-reply.drupal.org> | 2012-04-28 23:42:56 -0700 |
| commit | faf3e8575e043ae8658f7237b196dd0b83ab1a39 (patch) | |
| tree | 6cba053141f233000b8ac46c4a5c31660e032639 /modules/dblog | |
| parent | a5e79e0cba1e9b2ebb63d73c7cc8ea488cb83f9a (diff) | |
| download | brdo-faf3e8575e043ae8658f7237b196dd0b83ab1a39.tar.gz brdo-faf3e8575e043ae8658f7237b196dd0b83ab1a39.tar.bz2 | |
Issue #598586 by grendzy, deekayen, matglas86, dawehner, Zgear: Fixed watchdog() assumes is defined.
Diffstat (limited to 'modules/dblog')
| -rw-r--r-- | modules/dblog/dblog.module | 5 | ||||
| -rw-r--r-- | modules/dblog/dblog.test | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/modules/dblog/dblog.module b/modules/dblog/dblog.module index a0d6d3bf0..9420c538d 100644 --- a/modules/dblog/dblog.module +++ b/modules/dblog/dblog.module @@ -138,12 +138,9 @@ 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' => $user_uid, + 'uid' => $log_entry['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 ca844a361..2e9810b86 100644 --- a/modules/dblog/dblog.test +++ b/modules/dblog/dblog.test @@ -105,6 +105,7 @@ class DBLogTestCase extends DrupalWebTestCase { 'severity' => $severity, 'link' => NULL, 'user' => $this->big_user, + 'uid' => isset($this->big_user->uid) ? $this->big_user->uid : 0, 'request_uri' => $base_root . request_uri(), 'referer' => $_SERVER['HTTP_REFERER'], 'ip' => ip_address(), @@ -387,6 +388,7 @@ class DBLogTestCase extends DrupalWebTestCase { 'severity' => WATCHDOG_NOTICE, 'link' => NULL, 'user' => $this->big_user, + 'uid' => isset($this->big_user->uid) ? $this->big_user->uid : 0, 'request_uri' => $base_root . request_uri(), 'referer' => $_SERVER['HTTP_REFERER'], 'ip' => ip_address(), |