From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 8 Jun 2009 18:55:32 +0000 (-0700)
Subject: Merge branch '0.7.x' into 0.8.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=adfb79a9bbdfb43f35c0f022c1de6118b10ce115;p=quix0rs-gnu-social.git

Merge branch '0.7.x' into 0.8.x

Conflicts:
	classes/Notice.php
	classes/Profile.php
	lib/common.php
	lib/util.php
	scripts/getvaliddaemons.php
	scripts/stopdaemons.sh
---

adfb79a9bbdfb43f35c0f022c1de6118b10ce115
diff --cc classes/Profile.php
index afc0ea4f74,3d13cd46af..4a459b9740
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@@ -170,7 -159,7 +170,7 @@@ class Profile extends Memcached_DataObj
          $ids = Notice::stream(array($this, '_streamDirect'),
                                array(),
                                'profile:notice_ids:' . $this->id,
-                               $offset, $limit, $since_id, $before_id, $since);
 -                              $offset, $limit, $since_id, $max_id);
++                              $offset, $limit, $since_id, $max_id, $since);
  
          return Notice::getStreamByIds($ids);
      }
diff --cc classes/User_group.php
index 7cc31e7026,a135015bac..a135015bac
mode 100644,100755..100644
--- a/classes/User_group.php
+++ b/classes/User_group.php
diff --cc lib/util.php
index ab12723098,22308f432c..9872d97c48
--- a/lib/util.php
+++ b/lib/util.php
@@@ -900,6 -892,34 +900,34 @@@ function common_enqueue_notice($notice
      return $result;
  }
  
+ function common_post_inbox_transports()
+ {
+     $transports = array('omb', 'sms');
+ 
+     if (common_config('xmpp', 'enabled')) {
+         $transports = array_merge($transports, array('jabber', 'public'));
+     }
+ 
+     return $transports;
+ }
+ 
+ function common_enqueue_notice_transport($notice, $transport)
+ {
+     $qi = new Queue_item();
+     $qi->notice_id = $notice->id;
+     $qi->transport = $transport;
+     $qi->created = $notice->created;
+     $result = $qi->insert();
+     if (!$result) {
+         $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
+         common_log(LOG_ERR, 'DB error inserting queue item: ' . $last_error->message);
+         throw new ServerException('DB error inserting queue item: ' . $last_error->message);
++>>>>>>> 0.7.x:lib/util.php
+     }
+     common_log(LOG_DEBUG, 'complete queueing notice ID = ' . $notice->id . ' for ' . $transport);
+     return true;
+ }
+ 
  function common_real_broadcast($notice, $remote=false)
  {
      $success = true;