From: Evan Prodromou Date: Thu, 5 Mar 2009 22:34:53 +0000 (-0800) Subject: Merge branch 'ping' of /var/www/mublog.corrupt into corrupt/ping X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=eaac9350dd0ff02dda975f48e0be0c6ad1e7a56d;p=quix0rs-gnu-social.git Merge branch 'ping' of /var/www/mublog.corrupt into corrupt/ping Conflicts: lib/util.php --- eaac9350dd0ff02dda975f48e0be0c6ad1e7a56d diff --cc lib/util.php index 167508d2b3,419e21e828..9637dc5063 --- a/lib/util.php +++ b/lib/util.php @@@ -852,7 -1124,7 +852,7 @@@ function common_broadcast_notice($notic function common_enqueue_notice($notice) { - foreach (array('jabber', 'omb', 'sms', 'public', 'twitter', 'facebook') as $transport) { - foreach (array('jabber', 'omb', 'sms', 'public', 'ping') as $transport) { ++ foreach (array('jabber', 'omb', 'sms', 'public', 'twitter', 'facebook', 'ping') as $transport) { $qi = new Queue_item(); $qi->notice_id = $notice->id; $qi->transport = $transport;