summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/ping/ping.module2
-rw-r--r--modules/syslog/syslog.module4
2 files changed, 3 insertions, 3 deletions
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;
}