Merge commit 'origin/0.8.x' into 0.9.x

1 files changed, 10 insertions, 3 deletions

diff --git a/classes/Notice.php b/classes/Notice.php
index 08125cf7b..101fadb67 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -873,8 +873,11 @@ class Notice extends Memcached_DataObject
                 if ($cnt > 0) {
                     $qry .= ', ';
                 }
-                $qry .= '('.$id.', '.$this->id.', '.$source.', "'.$this->created.'") ';
+                $qry .= '('.$id.', '.$this->id.', '.$source.", '".$this->created. "') ";
                 $cnt++;
+                if (rand() % NOTICE_INBOX_SOFT_LIMIT == 0) {
+                    Notice_inbox::gc($id);
+                }
                 if ($cnt >= MAX_BOXCARS) {
                     $inbox = new Notice_inbox();
                     $inbox->query($qry);
@@ -896,10 +899,14 @@ class Notice extends Memcached_DataObject
     {
         $user = new User();
 
+	if(common_config('db','quote_identifiers'))
+	    $user_table = '"user"';
+	else $user_table = 'user';
+
         $qry =
           'SELECT id ' .
-          'FROM user JOIN subscription '.
-          'ON user.id = subscription.subscriber ' .
+	  'FROM '. $user_table .' JOIN subscription '.
+	  'ON '. $user_table .'.id = subscription.subscriber ' .
           'WHERE subscription.subscribed = %d ';
 
         $user->query(sprintf($qry, $this->profile_id));