From 72c444e03c02d0e77af1d2717d933cdc6e9b2175 Mon Sep 17 00:00:00 2001
From: Jerome Bakker <jeabakker@coldtrick.com>
Date: Thu, 8 Nov 2012 11:10:44 +0100
Subject: Added missing language key for LoginException:Unknown

---
 languages/en.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'languages')

diff --git a/languages/en.php b/languages/en.php
index bb5376a44..62b35dd81 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -229,6 +229,7 @@ $english = array(
 	'LoginException:PasswordFailure' => 'We could not log you in. Please check your username/email and password.',
 	'LoginException:AccountLocked' => 'Your account has been locked for too many log in failures.',
 	'LoginException:ChangePasswordFailure' => 'Failed current password check.',
+	'LoginException:Unknown' => 'We could not log you in due to an unknown error.',
 
 	'deprecatedfunction' => 'Warning: This code uses the deprecated function \'%s\' and is not compatible with this version of Elgg',
 
-- 
cgit v1.2.3


From 04e73aa6428eb792bedbbd616891de52eed3dcbf Mon Sep 17 00:00:00 2001
From: Krzysztof Różalski <cristo.rabani@gmail.com>
Date: Wed, 28 Nov 2012 00:09:05 +0100
Subject: Fixes #4935 - Adds admin listing in admin panel

---
 engine/lib/admin.php                 |  5 +++--
 languages/en.php                     |  2 ++
 views/default/admin/users/admins.php | 12 ++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 views/default/admin/users/admins.php

(limited to 'languages')

diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index b65d98c95..3f23f079c 100644
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -268,8 +268,9 @@ function admin_init() {
 	// users
 	elgg_register_admin_menu_item('administer', 'users', null, 20);
 	elgg_register_admin_menu_item('administer', 'online', 'users', 10);
-	elgg_register_admin_menu_item('administer', 'newest', 'users', 20);
-	elgg_register_admin_menu_item('administer', 'add', 'users', 30);
+	elgg_register_admin_menu_item('administer', 'admins', 'users', 20);
+	elgg_register_admin_menu_item('administer', 'newest', 'users', 30);
+	elgg_register_admin_menu_item('administer', 'add', 'users', 40);
 
 	// configure
 	// plugins
diff --git a/languages/en.php b/languages/en.php
index 62b35dd81..2b5ba00fd 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -582,6 +582,7 @@ $english = array(
 	'admin:users' => "Users",
 	'admin:users:online' => 'Currently Online',
 	'admin:users:newest' => 'Newest',
+	'admin:users:admins' => 'Administrators',
 	'admin:users:add' => 'Add New User',
 	'admin:users:description' => "This admin panel allows you to control user settings for your site. Choose an option below to get started.",
 	'admin:users:adduser:label' => "Click here to add a new user...",
@@ -733,6 +734,7 @@ $english = array(
 	'admin:statistics:label:numusers' => "Number of users",
 	'admin:statistics:label:numonline' => "Number of users online",
 	'admin:statistics:label:onlineusers' => "Users online now",
+	'admin:statistics:label:admins'=>"Admins",
 	'admin:statistics:label:version' => "Elgg version",
 	'admin:statistics:label:version:release' => "Release",
 	'admin:statistics:label:version:version' => "Version",
diff --git a/views/default/admin/users/admins.php b/views/default/admin/users/admins.php
new file mode 100644
index 000000000..9b175d437
--- /dev/null
+++ b/views/default/admin/users/admins.php
@@ -0,0 +1,12 @@
+<?php
+$admins = elgg_list_entities(array(), 'elgg_get_admins');
+	
+?>
+<div class="elgg-module elgg-module-inline">
+	<div class="elgg-head">
+		<h3><?php echo elgg_echo('admin:statistics:label:admins'); ?></h3>
+	</div>
+	<div class="elgg-body">
+		<?php echo $admins; ?>
+	</div>
+</div>
-- 
cgit v1.2.3