From: Brion Vibber <brion@pobox.com>
Date: Thu, 7 Oct 2010 20:32:26 +0000 (-0700)
Subject: Merge branch '0.9.x' into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6c959c83ce528614f6e0837cf022d1a67b64b73c;p=quix0rs-gnu-social.git

Merge branch '0.9.x' into 1.0.x
---

6c959c83ce528614f6e0837cf022d1a67b64b73c
diff --cc plugins/BitlyUrl/BitlyUrlPlugin.php
index e1c8d3462e,93a35b3f38..f4d987489a
--- a/plugins/BitlyUrl/BitlyUrlPlugin.php
+++ b/plugins/BitlyUrl/BitlyUrlPlugin.php
@@@ -31,9 -33,14 +33,12 @@@ if (!defined('STATUSNET')) 
      exit(1);
  }
  
 -require_once INSTALLDIR.'/plugins/UrlShortener/UrlShortenerPlugin.php';
 -
  class BitlyUrlPlugin extends UrlShortenerPlugin
  {
-     public $serviceUrl;
+     public $shortenerName = 'bit.ly';
+     public $serviceUrl = 'http://bit.ly/api?method=shorten&version=2.0.1&longUrl=%s';
+     public $login; // To set a site-default when admins or users don't override it.
+     public $apiKey;
  
      function onInitializePlugin(){
          parent::onInitializePlugin();