aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-15 12:56:01 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-15 12:56:01 +0000
commita6eb3bf8d0f49e9b20fa8153ddca7b9d551f950d (patch)
treea435afa05cab8bf2ea5d7e4b785f018e695f1869 /engine
parent2165e929ddf954f02a589234b2e0faef7ef18df7 (diff)
downloadelgg-a6eb3bf8d0f49e9b20fa8153ddca7b9d551f950d.tar.gz
elgg-a6eb3bf8d0f49e9b20fa8153ddca7b9d551f950d.tar.bz2
moving friends views into core
git-svn-id: http://code.elgg.org/elgg/trunk@7633 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/access.php4
-rw-r--r--engine/lib/users.php12
2 files changed, 3 insertions, 13 deletions
diff --git a/engine/lib/access.php b/engine/lib/access.php
index b87d150c0..ef9794802 100644
--- a/engine/lib/access.php
+++ b/engine/lib/access.php
@@ -725,7 +725,7 @@ function get_members_of_access_collection($collection, $idonly = FALSE) {
}
/**
- * Displays a user's access collections, using the friends/collections view
+ * Displays a user's access collections, using the core/friends/collections view
*
* @param int $owner_guid The GUID of the owning user
*
@@ -740,7 +740,7 @@ function elgg_view_access_collections($owner_guid) {
}
}
- return elgg_view('friends/collections', array('collections' => $collections));
+ return elgg_view('core/friends/collections', array('collections' => $collections));
}
/**
diff --git a/engine/lib/users.php b/engine/lib/users.php
index 033a4bdb6..61ea58b29 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1515,19 +1515,8 @@ function users_pagesetup() {
* @return void
*/
function users_init() {
- // Load config
global $CONFIG;
- // add Friends to tools menu - if profile mod is running
- // now added to toolbar
- /*
- if ( isloggedin() && is_plugin_enabled('profile') ) {
- $user = get_loggedin_user();
- add_menu(elgg_echo('friends'), $CONFIG->wwwroot .
- "pg/friends/" . $user->username, array(), 'core:friends');
- }
- */
-
register_page_handler('friends', 'friends_page_handler');
register_page_handler('friendsof', 'friends_of_page_handler');
register_page_handler('dashboard', 'dashboard_page_handler');
@@ -1535,6 +1524,7 @@ function users_init() {
register_page_handler('resetpassword', 'elgg_user_resetpassword_page_handler');
register_page_handler('login', 'elgg_user_login_page_handler');
register_page_handler('members', 'elgg_members_page_handler');
+ //register_page_handler('collections', 'collections_page_handler');
add_menu(elgg_echo('members'), 'pg/members/');