diff options
| author | cash <cash.costello@gmail.com> | 2011-09-30 17:03:51 -0400 |
|---|---|---|
| committer | cash <cash.costello@gmail.com> | 2011-09-30 17:03:51 -0400 |
| commit | d50ec282fa3da9947968e959affd48825b2a7bbb (patch) | |
| tree | 8817b381cfdf8e0f4f1b97444d3c383bc6acf14c /views/default | |
| parent | 150452e26d589bddcd74fa65a1b320f16574613c (diff) | |
| download | elgg-d50ec282fa3da9947968e959affd48825b2a7bbb.tar.gz elgg-d50ec282fa3da9947968e959affd48825b2a7bbb.tar.bz2 | |
Fixes #3904 action word should come first for encode_text parameter
Diffstat (limited to 'views/default')
| -rw-r--r-- | views/default/core/friends/collection.php | 2 | ||||
| -rw-r--r-- | views/default/output/confirmlink.php | 12 |
2 files changed, 7 insertions, 7 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>"; } diff --git a/views/default/output/confirmlink.php b/views/default/output/confirmlink.php index 31a34ae63..953c15f1b 100644 --- a/views/default/output/confirmlink.php +++ b/views/default/output/confirmlink.php @@ -6,16 +6,16 @@ * @package Elgg * @subpackage Core * - * @uses $vars['text'] The text of the link - * @uses $vars['href'] The address - * @uses $vars['title'] The title text (defaults to confirm text) - * @uses $vars['confirm'] The dialog text - * @uses $vars['text_encode'] Encode special characters? (false) + * @uses $vars['text'] The text of the link + * @uses $vars['href'] The address + * @uses $vars['title'] The title text (defaults to confirm text) + * @uses $vars['confirm'] The dialog text + * @uses $vars['encode_text'] Run $vars['text'] through htmlspecialchars() (false) */ $vars['rel'] = elgg_extract('confirm', $vars, elgg_echo('question:areyousure')); $vars['rel'] = addslashes($vars['rel']); -$encode = elgg_extract('text_encode', $vars, false); +$encode = elgg_extract('encode_text', $vars, false); // always generate missing action tokens $vars['href'] = elgg_add_action_tokens_to_url(elgg_normalize_url($vars['href']), true); |