diff options
| -rw-r--r-- | engine/lib/access.php | 4 | ||||
| -rw-r--r-- | engine/lib/users.php | 12 | ||||
| -rw-r--r-- | mod/groups/views/default/forms/groups/invite.php | 2 | ||||
| -rw-r--r-- | pages/friends/pickercallback.php | 6 | ||||
| -rw-r--r-- | views/default/core/friends/collection.php (renamed from views/default/friends/collection.php) | 4 | ||||
| -rw-r--r-- | views/default/core/friends/collections.php (renamed from views/default/friends/collections.php) | 2 | ||||
| -rw-r--r-- | views/default/core/friends/collectiontabs.php (renamed from views/default/friends/collectiontabs.php) | 0 | ||||
| -rw-r--r-- | views/default/core/friends/picker.php (renamed from views/default/friends/picker.php) | 0 | ||||
| -rw-r--r-- | views/default/core/friends/tablelist.php (renamed from views/default/friends/tablelist.php) | 0 | ||||
| -rw-r--r-- | views/default/core/friends/tablelistcountupdate.php (renamed from views/default/friends/tablelistcountupdate.php) | 0 | ||||
| -rw-r--r-- | views/default/forms/friends/edit.php | 2 |
11 files changed, 11 insertions, 21 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/'); diff --git a/mod/groups/views/default/forms/groups/invite.php b/mod/groups/views/default/forms/groups/invite.php index 279e11a20..8b8ccb665 100644 --- a/mod/groups/views/default/forms/groups/invite.php +++ b/mod/groups/views/default/forms/groups/invite.php @@ -17,7 +17,7 @@ if ($friends) { <?php echo elgg_view('input/securitytoken'); - echo elgg_view('friends/picker',array('entities' => $friends, 'internalname' => 'user_guid', 'highlight' => 'all')); + echo elgg_view('core/friends/picker',array('entities' => $friends, 'internalname' => 'user_guid', 'highlight' => 'all')); ?> <input type="hidden" name="forward_url" value="<?php echo $forward_url; ?>" /> <input type="hidden" name="group_guid" value="<?php echo $group->guid; ?>" /> diff --git a/pages/friends/pickercallback.php b/pages/friends/pickercallback.php index 16cef1110..1ca29ede9 100644 --- a/pages/friends/pickercallback.php +++ b/pages/friends/pickercallback.php @@ -32,14 +32,14 @@ if (!$pageowner) { // Depending on the view type, launch a different view switch($type) { case 'list': - $js_segment = elgg_view('friends/tablelistcountupdate', + $js_segment = elgg_view('core/friends/tablelistcountupdate', array('friendspicker' => $friendspicker, 'count' => sizeof($members))); - $content = elgg_view('friends/tablelist', + $content = elgg_view('core/friends/tablelist', array('entities' => $members, 'content' => $js_segment)); break; default: $friends = $pageowner->getFriends('', 9999); - $content = elgg_view('friends/picker', array( + $content = elgg_view('core/friends/picker', array( 'entities' => $friends, 'value' => $members, 'callback' => true, diff --git a/views/default/friends/collection.php b/views/default/core/friends/collection.php index 665e6d34d..9463d5b42 100644 --- a/views/default/friends/collection.php +++ b/views/default/core/friends/collection.php @@ -35,9 +35,9 @@ echo " (<span id=\"friends_membership_count{$vars['friendspicker']}\">{$count}</ // individual collection panels if ($friends = $vars['collection']->entities) { - $content = elgg_view('friends/collectiontabs', array('owner' => get_loggedin_user(), 'collection' => $vars['collection'], 'friendspicker' => $vars['friendspicker'])); + $content = elgg_view('core/friends/collectiontabs', array('owner' => get_loggedin_user(), 'collection' => $vars['collection'], 'friendspicker' => $vars['friendspicker'])); - echo elgg_view('friends/picker',array('entities' => $friends, 'value' => $members, 'content' => $content, 'replacement' => '', 'friendspicker' => $vars['friendspicker'])); + echo elgg_view('core/friends/picker', array('entities' => $friends, 'value' => $members, 'content' => $content, 'replacement' => '', 'friendspicker' => $vars['friendspicker'])); ?> <script type="text/javascript"> diff --git a/views/default/friends/collections.php b/views/default/core/friends/collections.php index d0669bb46..6554059b1 100644 --- a/views/default/friends/collections.php +++ b/views/default/core/friends/collections.php @@ -19,7 +19,7 @@ if (is_array($vars['collections']) && sizeof($vars['collections'])) { foreach($vars['collections'] as $collection) { $friendspicker++; - echo elgg_view('friends/collection',array('collection' => $collection, 'friendspicker' => $friendspicker)); + echo elgg_view('core/friends/collection', array('collection' => $collection, 'friendspicker' => $friendspicker)); } echo "</ul>"; diff --git a/views/default/friends/collectiontabs.php b/views/default/core/friends/collectiontabs.php index 6aef4bf1e..6aef4bf1e 100644 --- a/views/default/friends/collectiontabs.php +++ b/views/default/core/friends/collectiontabs.php diff --git a/views/default/friends/picker.php b/views/default/core/friends/picker.php index 3bbe4ffe2..3bbe4ffe2 100644 --- a/views/default/friends/picker.php +++ b/views/default/core/friends/picker.php diff --git a/views/default/friends/tablelist.php b/views/default/core/friends/tablelist.php index 12a0763c9..12a0763c9 100644 --- a/views/default/friends/tablelist.php +++ b/views/default/core/friends/tablelist.php diff --git a/views/default/friends/tablelistcountupdate.php b/views/default/core/friends/tablelistcountupdate.php index 8e2ab637d..8e2ab637d 100644 --- a/views/default/friends/tablelistcountupdate.php +++ b/views/default/core/friends/tablelistcountupdate.php diff --git a/views/default/forms/friends/edit.php b/views/default/forms/friends/edit.php index 632268fb8..16bb32fd9 100644 --- a/views/default/forms/friends/edit.php +++ b/views/default/forms/friends/edit.php @@ -41,7 +41,7 @@ if($vars['collection_members']){ $form_body .= "</p>"; $form_body .= "<p><label>" . elgg_echo("friends:addfriends") . "</label>". - elgg_view('friends/picker',array('entities' => $vars['friends'], 'internalname' => 'friends_collection', 'highlight' => $highlight)) . "</p>"; + elgg_view('core/friends/picker',array('entities' => $vars['friends'], 'internalname' => 'friends_collection', 'highlight' => $highlight)) . "</p>"; $form_body .= "<p>"; if (isset($vars['collection'])) { |