6 files changed, 26 insertions, 13 deletions

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 0f5c1f677..78ec95c26 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -25,7 +25,6 @@ table, caption, tbody, tfoot, thead, tr, th, td {
 	margin: 0;
 	padding: 0;
 	border: 0;
-	outline: 0;
 	font-weight: inherit;
 	font-style: inherit;
 	font-size: 100%;
@@ -41,9 +40,6 @@ img {
 	border-width: 0;
 	border-color: transparent;
 }
-:focus {
-	outline: 0 none;
-}
 ol, ul {
 	list-style: none;
 }
@@ -359,6 +355,8 @@ p {
 .elgg-table td, .elgg-table th {
 	background: white;
 	border: 1px solid #ccc;
+	padding: 4px 8px;
+	vertical-align: middle;
 }
 .elgg-table th {
 	background-color: #ddd;
@@ -366,10 +364,10 @@ p {
 .elgg-table .alt td {
 	background: #eee;
 }
-.elgg-table td {
-	padding: 4px 8px;
-	border-bottom: 1px solid #ccc;
+.elgg-table input[type=checkbox] {
+	margin-top: 3px;
 }
+
 .elgg-table-alt {
 	width: 100%;
 	border-top: 1px solid #ccc;
@@ -441,7 +439,9 @@ input {
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
 	border-radius: 5px;
+	margin: 0;
 }
+
 /* default elgg core input field classes */
 .elgg-input-text,
 .elgg-input-tags,
@@ -471,7 +471,6 @@ textarea {
 	width: auto;
 	padding: 2px 4px;
 	cursor: pointer;
-	outline: none;
 }
 a.elgg-button {
 	padding: 3px 6px;
diff --git a/views/default/output/location.php b/views/default/output/location.php
index e3619d2e1..e1009f17d 100644
--- a/views/default/output/location.php
+++ b/views/default/output/location.php
@@ -11,4 +11,9 @@ if (isset($vars['entity'])) {
 	unset($vars['entity']);
 }
 
+// Fixes #4566 we used to allow arrays of strings for location
+if (is_array($vars['value'])) {
+	$vars['value'] = implode(', ', $vars['value']);
+}
+
 echo elgg_view('output/tag', $vars);
diff --git a/views/default/page/components/list.php b/views/default/page/components/list.php
index 28c907ab6..0cf7d507c 100644
--- a/views/default/page/components/list.php
+++ b/views/default/page/components/list.php
@@ -6,7 +6,7 @@
  *
  * @uses $vars['items']       Array of ElggEntity or ElggAnnotation objects
  * @uses $vars['offset']      Index of the first list item in complete list
- * @uses $vars['limit']       Number of items per page
+ * @uses $vars['limit']       Number of items per page. Only used as input to pagination.
  * @uses $vars['count']       Number of items in the complete list
  * @uses $vars['base_url']    Base URL of list (optional)
  * @uses $vars['pagination']  Show pagination? (default: true)
diff --git a/views/default/page/elements/comments.php b/views/default/page/elements/comments.php
index cf9b5f08b..97cb9574e 100644
--- a/views/default/page/elements/comments.php
+++ b/views/default/page/elements/comments.php
@@ -36,8 +36,7 @@ if ($html) {
 }
 
 if ($show_add_form) {
-	$form_vars = array('name' => 'elgg_add_comment');
-	echo elgg_view_form('comments/add', $form_vars, $vars);
+	echo elgg_view_form('comments/add', array(), $vars);
 }
 
 echo '</div>';
diff --git a/views/default/widgets/new_users/content.php b/views/default/widgets/new_users/content.php
index 207a67a9d..ba85e7421 100644
--- a/views/default/widgets/new_users/content.php
+++ b/views/default/widgets/new_users/content.php
@@ -6,5 +6,6 @@
 echo elgg_list_entities(array(
 	'type' => 'user',
 	'subtype'=> null,
-	'full_view' => FALSE
+	'full_view' => false,
+	'pagination' => false,
 ));
\ No newline at end of file
diff --git a/views/default/widgets/online_users/content.php b/views/default/widgets/online_users/content.php
index d81ff3705..6e0cc7abb 100644
--- a/views/default/widgets/online_users/content.php
+++ b/views/default/widgets/online_users/content.php
@@ -3,4 +3,13 @@
  * Online users widget
  */
 
-echo $users_online = get_online_users();
\ No newline at end of file
+$count = find_active_users(600, 10, 0, true);
+$objects = find_active_users(600, 10);
+
+if ($objects) {
+	echo elgg_view_entity_list($objects, array(
+		'count' => $count,
+		'limit' => 10,
+		'pagination' => false,
+	));
+}