aboutsummaryrefslogtreecommitdiff
path: root/pages/friends
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-26 20:57:09 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-26 20:57:09 +0000
commita2250e1854f23351b2a39e304e2bd5977f3fd867 (patch)
treec7a846a455073b88ef2db21115baf21fee57b138 /pages/friends
parent657295df1ff884ed9f00b001389978b142ac6ba7 (diff)
downloadelgg-a2250e1854f23351b2a39e304e2bd5977f3fd867.tar.gz
elgg-a2250e1854f23351b2a39e304e2bd5977f3fd867.tar.bz2
Fixes #2982 friends collections work even if the code is convoluted and poorly written.
git-svn-id: http://code.elgg.org/elgg/trunk@8495 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'pages/friends')
-rw-r--r--pages/friends/collections/add.php8
-rw-r--r--pages/friends/collections/pickercallback.php16
2 files changed, 4 insertions, 20 deletions
diff --git a/pages/friends/collections/add.php b/pages/friends/collections/add.php
index 51425db37..0bc3f1fcb 100644
--- a/pages/friends/collections/add.php
+++ b/pages/friends/collections/add.php
@@ -13,12 +13,8 @@ $title = elgg_echo('friends:collections:add');
$content = elgg_view_title($title);
-$form_body = elgg_view('forms/friends/collections/edit', array(
- 'friends' => get_user_friends(elgg_get_logged_in_user_guid(), "", 9999)
-));
-$content .= elgg_view('input/form', array(
- 'action' => 'action/friends/collections/add',
- 'body' => $form_body,
+$content .= elgg_view_form('friends/collections/add', array(), array(
+ 'friends' => get_user_friends(elgg_get_logged_in_user_guid(), "", 9999),
));
$body = elgg_view_layout('one_sidebar', array('content' => $content));
diff --git a/pages/friends/collections/pickercallback.php b/pages/friends/collections/pickercallback.php
index 8da44d8c0..228037590 100644
--- a/pages/friends/collections/pickercallback.php
+++ b/pages/friends/collections/pickercallback.php
@@ -43,27 +43,15 @@ switch($type) {
break;
default:
$friends = $pageowner->getFriends('', 9999);
- $params = array(
- 'collection' => get_access_collection($collection),
- 'friends' => $friends,
- 'friendspicker' => $friendspicker,
- );
- $content = elgg_view_form('friends/collections/edit', array(), $params);
- /*
- $form_body = elgg_view('input/hidden', array(
- 'name' => 'collection_id',
- 'value' => get_access_collection($collection)->id,
- ));
+
$content = elgg_view('input/friendspicker', array(
'entities' => $friends,
'value' => $members,
'callback' => true,
'friendspicker' => $friendspicker,
- 'formcontents' => $form_body,
+ 'collection_id' => $collection,
'formtarget' => $site_url . 'action/friends/collections/edit',
));
- *
- */
break;
}