From: Brion Vibber <brion@pobox.com>
Date: Thu, 10 Jun 2010 22:37:06 +0000 (-0700)
Subject: Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b1a68e15b760aa2e588680c9e8c7526a7a6d1d13;p=quix0rs-gnu-social.git

Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x

Conflicts:
	lib/default.php
	lib/util.php
	plugins/UrlShortener/UrlShortenerPlugin.php (has been removed?)
---

b1a68e15b760aa2e588680c9e8c7526a7a6d1d13
diff --cc lib/default.php
index 52a4ec7836,950c6018d8..754cf5728b
--- a/lib/default.php
+++ b/lib/default.php
@@@ -306,8 -304,7 +306,11 @@@ $default 
          array('subscribers' => true,
                'members' => true,
                'peopletag' => true),
 +        'url' =>
 +        array('shortener' => 'ur1.ca',
 +              'maxlength' => 25,
-               'maxnoticelength' => -1)
++              'maxnoticelength' => -1),
+         'http' => // HTTP client settings when contacting other sites
+         array('ssl_cafile' => false // To enable SSL cert validation, point to a CA bundle (eg '/usr/lib/ssl/certs/ca-certificates.crt')
+               ),
          );
diff --cc lib/util.php
index c6d8f814df,2a90b56a99..d8fb3b65e4
--- a/lib/util.php
+++ b/lib/util.php
@@@ -1270,10 -1243,18 +1270,9 @@@ function common_enqueue_notice($notice
          $transports[] = 'plugin';
      }
  
-     // @fixme move these checks into QueueManager and/or individual handlers
-     if ($notice->is_local == Notice::LOCAL_PUBLIC ||
-         $notice->is_local == Notice::LOCAL_NONPUBLIC) {
 -    $xmpp = common_config('xmpp', 'enabled');
 -
 -    if ($xmpp) {
 -        $transports[] = 'jabber';
 -    }
 -
+     // We can skip these for gatewayed notices.
+     if ($notice->isLocal()) {
          $transports = array_merge($transports, $localTransports);
 -        if ($xmpp) {
 -            $transports[] = 'public';
 -        }
      }
  
      if (Event::handle('StartEnqueueNotice', array($notice, &$transports))) {