diff options
Diffstat (limited to 'modules/dblog')
| -rw-r--r-- | modules/dblog/dblog.module | 7 | ||||
| -rw-r--r-- | modules/dblog/dblog.test | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/modules/dblog/dblog.module b/modules/dblog/dblog.module index 496a043a7..9420c538d 100644 --- a/modules/dblog/dblog.module +++ b/modules/dblog/dblog.module @@ -19,7 +19,7 @@ function dblog_help($path, $arg) { case 'admin/help#dblog': $output = ''; $output .= '<h3>' . t('About') . '</h3>'; - $output .= '<p>' . t('The Database logging module logs system events in the Drupal database. For more information, see the online handbook entry for the <a href="@dblog">Database logging module</a>.', array('@dblog' => 'http://drupal.org/handbook/modules/dblog')) . '</p>'; + $output .= '<p>' . t('The Database logging module logs system events in the Drupal database. For more information, see the online handbook entry for the <a href="@dblog">Database logging module</a>.', array('@dblog' => 'http://drupal.org/documentation/modules/dblog')) . '</p>'; $output .= '<h3>' . t('Uses') . '</h3>'; $output .= '<dl>'; $output .= '<dt>' . t('Monitoring your site') . '</dt>'; @@ -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(), |