6 files changed, 38 insertions, 24 deletions
diff --git a/views/default/core/settings/statistics/online.php b/views/default/core/settings/statistics/online.php
index f50ad9acc..1385ff60f 100644
--- a/views/default/core/settings/statistics/online.php
+++ b/views/default/core/settings/statistics/online.php
@@ -8,20 +8,13 @@
 
 $user = elgg_get_page_owner_entity();
 
-$logged_in = 0;
-$log = get_system_log($user->guid, "login", "", 'user', '', 1);
-
-if ($log) {
-	$logged_in = $log[0]->time_created;
-}
-
 $label_name = elgg_echo('usersettings:statistics:label:name');
 $label_email = elgg_echo('usersettings:statistics:label:email');
 $label_member_since = elgg_echo('usersettings:statistics:label:membersince');
 $label_last_login = elgg_echo('usersettings:statistics:label:lastlogin');
 
 $time_created = date("r", $user->time_created);
-$last_login = date("r", $logged_in);
+$last_login = date("r", $user->last_login);
 
 $title = elgg_echo('usersettings:statistics:yourdetails');
 
diff --git a/views/default/css/elements/typography.php b/views/default/css/elements/typography.php
index d93b28d2c..4c2c3c774 100644
--- a/views/default/css/elements/typography.php
+++ b/views/default/css/elements/typography.php
@@ -157,5 +157,6 @@ h6 { font-size: 0.8em; }
 	padding: 3px 5px;
 }
 .elgg-output img {
-	max-width: 100%;
+    max-width: 100%;
+    height: auto;
 }
 \ No newline at end of file
diff --git a/views/default/js/lightbox.php b/views/default/js/lightbox.php
index d2bceaf90..a1f018eea 100644
--- a/views/default/js/lightbox.php
+++ b/views/default/js/lightbox.php
@@ -3,7 +3,8 @@
  * Elgg lightbox
  *
  * Usage
- * Apply the class elgg-lightbox to links.
+ * Call elgg_load_js('lightbox') and elgg_load_css('lightbox') then
+ * apply the class elgg-lightbox to links.
  *
  * Advanced Usage
  * Elgg is distributed with the Fancybox jQuery library. Please go to
diff --git a/views/default/page/components/list.php b/views/default/page/components/list.php
index 0cf7d507c..28ed58ddf 100644
--- a/views/default/page/components/list.php
+++ b/views/default/page/components/list.php
@@ -51,14 +51,15 @@ if ($pagination && $count) {
 if (is_array($items) && count($items) > 0) {
 	$html .= "<ul class=\"$list_class\">";
 	foreach ($items as $item) {
-		if (elgg_instanceof($item)) {
-			$id = "elgg-{$item->getType()}-{$item->getGUID()}";
-		} else {
-			$id = "item-{$item->getType()}-{$item->id}";
+		$li = elgg_view_list_item($item, $vars);
+		if ($li) {
+			if (elgg_instanceof($item)) {
+				$id = "elgg-{$item->getType()}-{$item->getGUID()}";
+			} else {
+				$id = "item-{$item->getType()}-{$item->id}";
+			}
+			$html .= "<li id=\"$id\" class=\"$item_class\">$li</li>";
 		}
-		$html .= "<li id=\"$id\" class=\"$item_class\">";
-		$html .= elgg_view_list_item($item, $vars);
-		$html .= '</li>';
 	}
 	$html .= '</ul>';
 }
diff --git a/views/default/river/elements/image.php b/views/default/river/elements/image.php
index 9caa44b36..6f6aeae65 100644
--- a/views/default/river/elements/image.php
+++ b/views/default/river/elements/image.php
@@ -9,4 +9,8 @@
 
 $subject = $vars['item']->getSubjectEntity();
 
-echo elgg_view_entity_icon($subject, 'small');
+if (elgg_in_context('widgets')) {
+	echo elgg_view_entity_icon($subject, 'tiny');
+} else {
+	echo elgg_view_entity_icon($subject, 'small');
+}
diff --git a/views/default/widgets/control_panel/content.php b/views/default/widgets/control_panel/content.php
index d2db54bc6..a348d612f 100644
--- a/views/default/widgets/control_panel/content.php
+++ b/views/default/widgets/control_panel/content.php
@@ -11,12 +11,26 @@ elgg_register_menu_item('admin_control_panel', array(
 	'link_class' => 'elgg-button elgg-button-action',
 ));
 
-elgg_register_menu_item('admin_control_panel', array(
-	'name' => 'upgrade',
-	'text' => elgg_echo('upgrade'),
-	'href' => 'upgrade.php',
-	'link_class' => 'elgg-button elgg-button-action',
-));
+// @todo Move in this in ElggUpgradeManager::isLocked() when #4682 fixed
+$is_locked = _elgg_upgrade_is_locked();
+
+if (!$is_locked) {
+	elgg_register_menu_item('admin_control_panel', array(
+		'name' => 'upgrade',
+		'text' => elgg_echo('upgrade'),
+		'href' => 'upgrade.php',
+		'link_class' => 'elgg-button elgg-button-action',
+	));
+} else {
+	elgg_register_menu_item('admin_control_panel', array(
+		'name' => 'unlock_upgrade',
+		'text' => elgg_echo('upgrade:unlock'),
+		'href' => 'action/admin/site/unlock_upgrade',
+		'is_action' => true,
+		'link_class' => 'elgg-button elgg-button-action',
+		'confirm' => elgg_echo('upgrade:unlock:confirm'),
+	));
+}
 
 echo elgg_view_menu('admin_control_panel', array(
 	'class' => 'elgg-menu-hz',