Merged 18_new_admin branch to trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@5977 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 0 insertions, 34 deletions

diff --git a/admin/user.php b/admin/user.php
deleted file mode 100644
index c0d63d7e0..000000000
--- a/admin/user.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Elgg administration user system index
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
-// Get the Elgg framework
-require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
-
-// Make sure only valid admin users can see this
-admin_gatekeeper();
-
-// Are we performing a search
-$search = get_input('s');
-$limit = get_input('limit', 10);
-$offset = get_input('offset', 0);
-
-$context = get_context();
-
-$title = elgg_view_title(elgg_echo('admin:user'));
-
-set_context('search');
-
-$result = "<div class='members_list'>".elgg_list_entities(array('type' => 'user', 'limit' => $limit, 'offset' => $offset, 'full_view' => FALSE))."</div>";
-
-set_context('admin');
-
-// Display main admin menu
-page_draw(elgg_echo("admin:user"),
-	elgg_view_layout("one_column_with_sidebar", $title . elgg_view("admin/user") . $result));