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

actions/oauthconnectionssettings.php

@@ -31,6 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
+require_once INSTALLDIR . '/lib/applicationlist.php';
 require_once INSTALLDIR . '/lib/apioauthstore.php';
 
 /**

actions/urlsettings.php

@@ -99,6 +99,8 @@ class UrlsettingsAction extends SettingsAction
         $this->hidden('token', common_session_token());
         $this->elementStart('ul', 'form_data');
 
+        $shorteners = array();
+
         Event::handle('GetUrlShorteners', array(&$shorteners));
 
         $services = array();