summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/Notice_inbox.php6
-rw-r--r--lib/common.php6
-rw-r--r--lib/jabber.php8
3 files changed, 10 insertions, 10 deletions
diff --git a/classes/Notice_inbox.php b/classes/Notice_inbox.php
index 6c328e685..c27dcdfd6 100644
--- a/classes/Notice_inbox.php
+++ b/classes/Notice_inbox.php
@@ -31,12 +31,6 @@ define('NOTICE_INBOX_GC_MAX', 12800);
define('NOTICE_INBOX_LIMIT', 1000);
define('NOTICE_INBOX_SOFT_LIMIT', 1000);
-define('NOTICE_INBOX_SOURCE_SUB', 1);
-define('NOTICE_INBOX_SOURCE_GROUP', 2);
-define('NOTICE_INBOX_SOURCE_REPLY', 3);
-define('NOTICE_INBOX_SOURCE_FORWARD', 4);
-define('NOTICE_INBOX_SOURCE_GATEWAY', -1);
-
class Notice_inbox extends Memcached_DataObject
{
###START_AUTOCODE
diff --git a/lib/common.php b/lib/common.php
index 61decebb7..00e80373e 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -41,6 +41,12 @@ define('FOREIGN_NOTICE_SEND_REPLY', 4);
define('FOREIGN_FRIEND_SEND', 1);
define('FOREIGN_FRIEND_RECV', 2);
+define('NOTICE_INBOX_SOURCE_SUB', 1);
+define('NOTICE_INBOX_SOURCE_GROUP', 2);
+define('NOTICE_INBOX_SOURCE_REPLY', 3);
+define('NOTICE_INBOX_SOURCE_FORWARD', 4);
+define('NOTICE_INBOX_SOURCE_GATEWAY', -1);
+
# append our extlib dir as the last-resort place to find libs
set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/extlib/');
diff --git a/lib/jabber.php b/lib/jabber.php
index 69f0d3570..4cdfa6746 100644
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -359,7 +359,7 @@ function jabber_broadcast_notice($notice)
$ni = $notice->whoGets();
foreach ($ni as $user_id => $reason) {
- $user = User::staticGet('user_id', $user_id);
+ $user = User::staticGet($user_id);
if (empty($user) ||
empty($user->jabber) ||
!$user->jabbernotify) {
@@ -369,20 +369,20 @@ function jabber_broadcast_notice($notice)
switch ($reason) {
case NOTICE_INBOX_SOURCE_REPLY:
if (!$user->jabberreplies) {
- continue;
+ continue 2;
}
break;
case NOTICE_INBOX_SOURCE_SUB:
$sub = Subscription::pkeyGet(array('subscriber' => $user->id,
'subscribed' => $notice->profile_id));
if (empty($sub) || !$sub->jabber) {
- continue;
+ continue 2;
}
break;
case NOTICE_INBOX_SOURCE_GROUP:
break;
default:
- throw new Exception(_("Unknown inbox source."));
+ throw new Exception(sprintf(_("Unknown inbox source %d."), $reason));
}
common_log(LOG_INFO,