diff options
| -rw-r--r-- | includes/bootstrap.inc | 2 | ||||
| -rw-r--r-- | modules/ping/ping.module | 2 | ||||
| -rw-r--r-- | modules/syslog/syslog.module | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index 649d1bf81..c4215148f 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -648,7 +648,7 @@ function request_uri() { * @param $message * The message to store in the log. See t() for documentation * on how $message and $variables interact. Keep $message - * translateable by not concatenating dynamic values into it! + * translatable by not concatenating dynamic values into it! * @param $variables * Array of variables to replace in the message on display or * NULL if message is already translated or not possible to diff --git a/modules/ping/ping.module b/modules/ping/ping.module index 025b5da17..1e119993c 100644 --- a/modules/ping/ping.module +++ b/modules/ping/ping.module @@ -52,7 +52,7 @@ function ping_ping($name = '', $url = '') { $result = xmlrpc('http://rpc.pingomatic.com', 'weblogUpdates.ping', $name, $url); if ($result === FALSE) { - watchdog('directory ping', 'Failed to notify pingomatic.com (site).', WATCHDOG_WARNING); + watchdog('directory ping', 'Failed to notify pingomatic.com (site).', array(), WATCHDOG_WARNING); } } diff --git a/modules/syslog/syslog.module b/modules/syslog/syslog.module index 76ee75e57..1807b415d 100644 --- a/modules/syslog/syslog.module +++ b/modules/syslog/syslog.module @@ -98,8 +98,8 @@ function theme_syslog_format($entry) { '@referer_uri' => $entry['referer'], '@uid' => $entry['user']->uid, '@link' => strip_tags($entry['link']), - // Keep message English, but replace variable components. - '@message' => strip_tags(strtr($entry['message'], $entry['variables'])), + // Keep message English, but replace variable components, if present. + '@message' => strip_tags(is_null($entry['variables']) ? $entry['message'] : strtr($entry['message'], $entry['variables'])), )); return $message; } |