summaryrefslogtreecommitdiff
path: root/lib/jabber.php
diff options
context:
space:
mode:
authorMike Cochrane <mikec@mikenz.geek.nz>2008-07-09 18:46:30 -0400
committerMike Cochrane <mikec@mikenz.geek.nz>2008-07-09 18:46:30 -0400
commit4b656f47dff2bd6eed4dcfad060b8434d052d883 (patch)
tree6acc353a739f712ecbca9d825dcb7fa16f429ff1 /lib/jabber.php
parent67921b1c1871e881f71f8f15aa7fc9c2b11da64d (diff)
Merge conflicts and kill a whole lot of trailing whitespace on lines.
darcs-hash:20080709224630-533db-b5399baef280133858dac9b89c2cd6a2aba9f861.gz
Diffstat (limited to 'lib/jabber.php')
-rw-r--r--lib/jabber.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/jabber.php b/lib/jabber.php
index 66ff24e63..a36e19044 100644
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -133,7 +133,7 @@ function jabber_broadcast_notice($notice) {
while ($sub->fetch()) {
$user = User::staticGet($sub->subscriber);
if ($user && $user->jabber && $user->jabbernotify) {
- common_log(LOG_INFO,
+ common_log(LOG_INFO,
'Sending notice ' . $notice->id . ' to ' . $user->jabber,
__FILE__);
$success = jabber_send_message($user->jabber, $msg);