Merge branch 'master' into 0.9.x

[quix0rs-gnu-social.git] / actions / othersettings.php

diff --git a/actions/othersettings.php b/actions/othersettings.php
index 1d252f34ed89d02e09131c4e35d952ee7bb2bd1a..0de7cd90860b1a7cc26198a4e033c5820bb4ef5a 100644 (file)
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -98,7 +98,9 @@ class OthersettingsAction extends AccountSettingsAction
         $this->hidden('token', common_session_token());
         $this->elementStart('ul', 'form_data');
 
+        $shorteners = array();
         Event::handle('GetUrlShorteners', array(&$shorteners));
+        $services = array();
         foreach($shorteners as $name=>$value)
         {
             $services[$name]=$name;