3 files changed, 6 insertions, 6 deletions
diff --git a/views/default/core/friends/collection.php b/views/default/core/friends/collection.php
index 95f5944e7..1a330af01 100644
--- a/views/default/core/friends/collection.php
+++ b/views/default/core/friends/collection.php
@@ -25,7 +25,7 @@ if ($coll->owner_guid == elgg_get_logged_in_user_guid()) {
 			'href' => 'action/friends/collections/delete?collection=' . $coll->id,
 			'class' => 'delete_collection',
 			'text' => elgg_view_icon('delete'),
-			'text_encode' => false,
+			'encode_text' => false,
 		));
 	echo "</div>";
 }
@@ -43,7 +43,7 @@ if ($friends) {
 
 	echo elgg_view('input/friendspicker', array(
 		'entities' => $friends,
-		'value' => $members,
+		'value' => $vars['collection']->members,
 		'content' => $content,
 		'replacement' => '',
 		'friendspicker' => $vars['friendspicker'],
@@ -51,9 +51,9 @@ if ($friends) {
 ?>
 <?php //@todo JS 1.8: no ?>
 	<script type="text/javascript">
-	$(document).ready(function () {
+	$(function () {
 
-			$('#friends-picker_placeholder<?php echo $vars['friendspicker']; ?>').load('<?php echo elgg_get_site_url(); ?>pages/friends/collections/pickercallback.php?username=<?php echo elgg_get_logged_in_user_entity()->username; ?>&type=list&collection=<?php echo $vars['collection']->id; ?>');
+			$('#friends-picker_placeholder<?php echo $vars['friendspicker']; ?>').load(elgg.config.wwwroot + 'pages/friends/collections/pickercallback.php?username=<?php echo elgg_get_logged_in_user_entity()->username; ?>&type=list&collection=<?php echo $vars['collection']->id; ?>');
 
 	});
 	</script>
diff --git a/views/default/core/friends/collections.php b/views/default/core/friends/collections.php
index d88d591ad..c6ee082c8 100644
--- a/views/default/core/friends/collections.php
+++ b/views/default/core/friends/collections.php
@@ -30,7 +30,7 @@ if (is_array($vars['collections']) && sizeof($vars['collections'])) {
 ?>
 <?php //@todo JS 1.8: no ?>
 <script>
-$(document).ready(function(){
+$(function(){
 	$('#friends_collections_accordian h2').click(function () {
 		$(this.parentNode).children("[class=friends-picker-main-wrapper]").slideToggle("fast");
 		//return false;
diff --git a/views/default/core/friends/collectiontabs.php b/views/default/core/friends/collectiontabs.php
index 2fafe6a8c..bf12e0edb 100644
--- a/views/default/core/friends/collectiontabs.php
+++ b/views/default/core/friends/collectiontabs.php
@@ -31,7 +31,7 @@ $ownerid = $vars['owner']->getGUID();
 
 <?php //@todo JS 1.8: no ?>
 <script type="text/javascript">
-$(document).ready(function () {
+$(function () {
 
 	$('a.collectionmembers<?php echo $friendspicker; ?>').click(function () {
 		// load collection members pane