Fixes #3904 action word should come first for encode_text parameter

diff --git a/engine/lib/navigation.php b/engine/lib/navigation.php
index 27af26be24727325bfc17642cfec64308c9ea1a1..778da94e9aff3d4b806905ce3c99e664997705fd 100644 (file)
--- a/engine/lib/navigation.php
+++ b/engine/lib/navigation.php
@@ -393,7 +393,7 @@ function elgg_annotation_menu_setup($hook, $type, $return, $params) {
                        'href' => $url,
                        'text' => "<span class=\"elgg-icon elgg-icon-delete\"></span>",
                        'confirm' => elgg_echo('deleteconfirm'),
-                       'text_encode' => false
+                       'encode_text' => false
                );
                $return[] = ElggMenuItem::factory($options);
        }

diff --git a/mod/groups/start.php b/mod/groups/start.php
index 9e4694457484c98d50c7beb60c03754d03a4cd3f..0425bdea6d9492085b5a80ff66e4aec55f064610 100644 (file)
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -435,7 +435,7 @@ function groups_annotation_menu_setup($hook, $type, $return, $params) {
                        'href' => $url,
                        'text' => "<span class=\"elgg-icon elgg-icon-delete\"></span>",
                        'confirm' => elgg_echo('deleteconfirm'),
-                       'text_encode' => false
+                       'encode_text' => false
                );
                $return[] = ElggMenuItem::factory($options);
 
@@ -447,7 +447,7 @@ function groups_annotation_menu_setup($hook, $type, $return, $params) {
                        'name' => 'edit',
                        'href' => "#edit-annotation-$annotation->id",
                        'text' => elgg_echo('edit'),
-                       'text_encode' => false,
+                       'encode_text' => false,
                        'rel' => 'toggle',
                );
                $return[] = ElggMenuItem::factory($options);

diff --git a/mod/likes/views/default/annotation/likes.php b/mod/likes/views/default/annotation/likes.php
index e1ae20818445e4267aff7c45be504fe5b12f2a97..2dd01b6cd22915b36a8ef3cb0f116c818f519239 100644 (file)
--- a/mod/likes/views/default/annotation/likes.php
+++ b/mod/likes/views/default/annotation/likes.php
@@ -31,7 +31,7 @@ if ($like->canEdit()) {
                                                'href' => "action/likes/delete?annotation_id={$like->id}",
                                                'text' => "<span class=\"elgg-icon elgg-icon-delete right\"></span>",
                                                'confirm' => elgg_echo('deleteconfirm'),
-                                               'text_encode' => false,
+                                               'encode_text' => false,
                                        ));
 }
 

diff --git a/mod/messageboard/start.php b/mod/messageboard/start.php
index 8a7f00958c577b328ac75f756b0fdfb6817df74a..0b0155069e3801d83f122e463503c4bcf5e1c7f6 100644 (file)
--- a/mod/messageboard/start.php
+++ b/mod/messageboard/start.php
@@ -150,7 +150,7 @@ function messageboard_annotation_menu_setup($hook, $type, $return, $params) {
                        'href' => $url,
                        'text' => "<span class=\"elgg-icon elgg-icon-delete\"></span>",
                        'confirm' => elgg_echo('deleteconfirm'),
-                       'text_encode' => false
+                       'encode_text' => false
                );
                $return[] = ElggMenuItem::factory($options);
        }

diff --git a/mod/messages/views/default/object/messages.php b/mod/messages/views/default/object/messages.php
index b2d127d85f08bfbed7c7635ab9c40cb88bcb3d2e..b6f9ed6d50d3273b454a7ee78daf87a0ee293cdd 100644 (file)
--- a/mod/messages/views/default/object/messages.php
+++ b/mod/messages/views/default/object/messages.php
@@ -69,7 +69,7 @@ $delete_link = elgg_view("output/confirmlink", array(
                                                'href' => "action/messages/delete?guid=" . $message->getGUID(),
                                                'text' => "<span class=\"elgg-icon elgg-icon-delete right\"></span>",
                                                'confirm' => elgg_echo('deleteconfirm'),
-                                               'text_encode' => false,
+                                               'encode_text' => false,
                                        ));
 
 $body = <<<HTML

diff --git a/views/default/core/friends/collection.php b/views/default/core/friends/collection.php
index dac98bc5d28d2d91daae060317b4c61481d39025..b7913da5f7def3bef7cd101854464fb12960142c 100644 (file)
--- 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 31a34ae631cfe2fae74a510f219856bfe77bbc43..953c15f1bd0f35f4ea07c90ec53754a457d56751 100644 (file)
--- 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);