Merge branch 'master' into 0.9.x

1 files changed, 8 insertions, 0 deletions

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');