summaryrefslogtreecommitdiff
path: root/lib/util.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/util.php')
-rw-r--r--lib/util.php13
1 files changed, 2 insertions, 11 deletions
diff --git a/lib/util.php b/lib/util.php
index 214c33279..22308f432 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -884,16 +884,12 @@ function common_enqueue_notice($notice)
// If inboxes are enabled, wait till inboxes are filled
// before doing inbox-dependent broadcasts
- if (common_config('inboxes', 'enabled') === true ||
- common_config('inboxes', 'enabled') === 'transitional') {
- $transports[] = 'inbox';
- } else {
- $transports = array_merge($transports, common_post_inbox_transports());
- }
+ $transports = array_merge($transports, common_post_inbox_transports());
foreach ($transports as $transport) {
common_enqueue_notice_transport($notice, $transport);
}
+
return $result;
}
@@ -905,11 +901,6 @@ function common_post_inbox_transports()
$transports = array_merge($transports, array('jabber', 'public'));
}
- if (common_config('memcached', 'enabled')) {
- // Note: limited to 8 chars
- $transports[] = 'memcache';
- }
-
return $transports;
}