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?)

diff --cc actions/apiaccountupdatedeliverydevice.php
Simple merge

diff --cc index.php
Simple merge

diff --cc lib/apiaction.php
Simple merge

diff --cc lib/default.php
index 52a4ec7836e7a7d4b76259525235fa94df38a821,950c6018d8f167095e7b9d30a9eeb9a63e823c17..754cf5728b28c0d2d9164fae73d933ac032eb0e6
--- 1/lib/default.php
--- 2/lib/default.php
+++ b/lib/default.php
@@@ -306,8 -304,7 +306,11 @@@ $default 
          array('subscribers' => true,
                'members' => true,
                'peopletag' => true),
-               'maxnoticelength' => -1)
 +        'url' =>
 +        array('shortener' => 'ur1.ca',
 +              'maxlength' => 25,
++              '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/router.php
Simple merge

diff --cc lib/util.php
index c6d8f814df7593fd778bac80ddf9f338777be4ee,2a90b56a992dcb27383f13b30243aba65c52eba9..d8fb3b65e44070e4f83dd680f6d607ee97570df1
--- 1/lib/util.php
--- 2/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))) {

diff --cc plugins/BitlyUrl/BitlyUrlPlugin.php
Simple merge

diff --cc plugins/ClientSideShorten/ClientSideShortenPlugin.php
Simple merge

diff --cc plugins/Imap/imapmanager.php
Simple merge

diff --cc plugins/LilUrl/LilUrlPlugin.php
Simple merge

diff --cc plugins/PtitUrl/PtitUrlPlugin.php
Simple merge

diff --cc plugins/SimpleUrl/SimpleUrlPlugin.php
Simple merge

diff --cc plugins/TightUrl/TightUrlPlugin.php
Simple merge