aboutsummaryrefslogtreecommitdiff
path: root/views/default/core
diff options
context:
space:
mode:
authorBrett Profitt <brett.profitt@gmail.com>2011-10-02 11:17:56 -0700
committerBrett Profitt <brett.profitt@gmail.com>2011-10-02 11:17:56 -0700
commitdd55b4b87cb1c89ceeb45ccf49ce648339a86041 (patch)
tree035059f5f06a2f6595110aff7c620380b46af103 /views/default/core
parentbfdb9bb8a87a29038ba1ae25355684ae19678fdd (diff)
parentad016fd1254aa03afa7c24fdb82b35faa3c5019f (diff)
downloadelgg-dd55b4b87cb1c89ceeb45ccf49ce648339a86041.tar.gz
elgg-dd55b4b87cb1c89ceeb45ccf49ce648339a86041.tar.bz2
Merge branch 'master' of github.com:Elgg/Elgg
Diffstat (limited to 'views/default/core')
-rw-r--r--views/default/core/friends/collection.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/views/default/core/friends/collection.php b/views/default/core/friends/collection.php
index dac98bc5d..b7913da5f 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>";
}