Merge branch 'master' into 0.9.x

6 files changed, 27 insertions, 6 deletions

diff --git a/lib/action.php b/lib/action.php
index 5dcf78dcc..5482ac377 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -715,14 +715,14 @@ class Action extends HTMLOutputter // lawsuit
     {
         $this->elementStart('div', array('id' => 'aside_primary',
                                          'class' => 'aside'));
-        if (Event::handle('StartShowExportData', array($this))) {
-            $this->showExportData();
-            Event::handle('EndShowExportData', array($this));
-        }
         if (Event::handle('StartShowSections', array($this))) {
             $this->showSections();
             Event::handle('EndShowSections', array($this));
         }
+        if (Event::handle('StartShowExportData', array($this))) {
+            $this->showExportData();
+            Event::handle('EndShowExportData', array($this));
+        }
         $this->elementEnd('div');
     }
 
diff --git a/lib/activityobject.php b/lib/activityobject.php
index 0fc06948b..95615d581 100644
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -428,6 +428,17 @@ class ActivityObject
                 $alink->height = $size;
                 $alink->width  = $size;
                 $alink->url    = Avatar::defaultImage($size);
+
+                if ($size == AVATAR_PROFILE_SIZE) {
+                    // Hack for Twitter import: we don't have a 96x96 image,
+                    // but we do have a 73x73 image. For now, fake it with that.
+                    $avatar = $profile->getAvatar(73);
+                    if ($avatar) {
+                        $alink = AvatarLink::fromAvatar($avatar);
+                        $alink->height= $size;
+                        $alink->width = $size;
+                    }
+                }
             }
 
             $object->avatarLinks[] = $alink;
diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php
index 5c414bbd7..fae9f4fa5 100644
--- a/lib/adminpanelaction.php
+++ b/lib/adminpanelaction.php
@@ -396,6 +396,14 @@ class AdminPanelNav extends Widget
                                      $menu_title, $action_name == 'snapshotadminpanel', 'nav_snapshot_admin_panel');
             }
 
+            if (AdminPanelAction::canAdmin('license')) {
+                // TRANS: Menu item title/tooltip
+                $menu_title = _('Set site license');
+                // TRANS: Menu item for site administration
+                $this->out->menuItem(common_local_url('licenseadminpanel'), _('License'),
+                                     $menu_title, $action_name == 'licenseadminpanel', 'nav_license_admin_panel');
+            }
+
             Event::handle('EndAdminPanelNav', array($this));
         }
         $this->action->elementEnd('ul');
diff --git a/lib/default.php b/lib/default.php
index 45a4560ff..6200abada 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -300,7 +300,7 @@ $default =
                                  'OpenID' => null),
               ),
         'admin' =>
-        array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions', 'sitenotice')),
+        array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'license')),
         'singleuser' =>
         array('enabled' => false,
               'nickname' => null),
diff --git a/lib/feedlist.php b/lib/feedlist.php
index 9ae83f5e8..7493e3575 100644
--- a/lib/feedlist.php
+++ b/lib/feedlist.php
@@ -61,7 +61,7 @@ class FeedList extends Widget
     {
         $this->out->elementStart('div', array('id' => 'export_data',
                                               'class' => 'section'));
-        $this->out->element('h2', null, _('Export data'));
+        $this->out->element('h2', null, _('Feeds'));
         $this->out->elementStart('ul', array('class' => 'xoxo'));
 
         foreach ($feeds as $feed) {
diff --git a/lib/router.php b/lib/router.php
index 7e1e6a2a4..fb5a3c7c3 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -690,6 +690,8 @@ class Router
             $m->connect('admin/sessions', array('action' => 'sessionsadminpanel'));
             $m->connect('admin/sitenotice', array('action' => 'sitenoticeadminpanel'));
             $m->connect('admin/snapshot', array('action' => 'snapshotadminpanel'));
+            $m->connect('admin/license', array('action' => 'licenseadminpanel'));
+
 
             $m->connect('getfile/:filename',
                         array('action' => 'getfile'),