From 76ee1fd5daa6ab1999224d8e93df1b7116f24c36 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sat, 30 May 2009 04:40:47 -0400
Subject: Removing inbox and memcached daemon handling

---
 lib/util.php | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'lib/util.php')

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;
 }
 
-- 
cgit v1.2.3-54-g00ecf