Skip to content
Browse files

Fixed #2218 finished up the encoding issues by turning of double enco…

…ding

git-svn-id: http://code.elgg.org/elgg/trunk@8199 36083f99-b078-4883-b0ff-0f9b5a30f544
  • Loading branch information...
1 parent 0f15382 commit 3b280cf0fdb3b08ab91a32e491f73bdb0ee2c96c @cash cash committed Feb 13, 2011
View
2 views/default/output/confirmlink.php
@@ -21,7 +21,7 @@
$text = elgg_get_array_value('text', $vars, '');
if ($encode) {
- $text = htmlspecialchars($text, ENT_QUOTES, 'UTF-8');
+ $text = htmlspecialchars($text, ENT_QUOTES, 'UTF-8', false);
}
$vars['onclick'] = "return confirm('" . addslashes($confirm) . "')";
View
2 views/default/output/dropdown.php
@@ -10,4 +10,4 @@
*
*/
-echo htmlspecialchars($vars['value'], ENT_QUOTES, 'UTF-8');
+echo htmlspecialchars($vars['value'], ENT_QUOTES, 'UTF-8', false);
View
2 views/default/output/email.php
@@ -11,5 +11,5 @@
*/
if (!empty($vars['value'])) {
- echo "<a href=\"mailto:" . $vars['value'] . "\">". htmlspecialchars($vars['value'], ENT_QUOTES, 'UTF-8') ."</a>";
+ echo "<a href=\"mailto:" . $vars['value'] . "\">". htmlspecialchars($vars['value'], ENT_QUOTES, 'UTF-8', false) ."</a>";
}
View
4 views/default/output/pulldown.php
@@ -8,7 +8,7 @@
*
* @uses $vars['text'] The text to display
*
- * @deprecated 1.8
+ * @deprecated 1.8 Use output/dropdown
*/
-echo htmlspecialchars($vars['value'], ENT_QUOTES, 'UTF-8');
+echo elgg_view('output/dropdown', $vars);
View
2 views/default/output/radio.php
@@ -10,4 +10,4 @@
*
*/
-echo elgg_view('output/text',$vars);
+echo elgg_view('output/text', $vars);
View
2 views/default/output/text.php
@@ -10,4 +10,4 @@
*
*/
-echo htmlspecialchars($vars['value'], ENT_QUOTES, 'UTF-8'); // $vars['value'];
+echo htmlspecialchars($vars['value'], ENT_QUOTES, 'UTF-8', false);
View
6 views/default/output/url.php
@@ -21,13 +21,13 @@
if (isset($vars['text'])) {
if (isset($vars['encode_text']) && $vars['encode_text']) {
- $text = htmlspecialchars($vars['text'], ENT_QUOTES, 'UTF-8');
+ $text = htmlspecialchars($vars['text'], ENT_QUOTES, 'UTF-8', false);
} else {
$text = $vars['text'];
}
unset($vars['text']);
} else {
- $text = htmlspecialchars($url, ENT_QUOTES, 'UTF-8');
+ $text = htmlspecialchars($url, ENT_QUOTES, 'UTF-8', false);
}
unset($vars['encode_text']);
@@ -36,7 +36,7 @@
$url = elgg_normalize_url($url);
if (isset($vars['is_action'])) {
- $url = elgg_add_action_tokens_to_url($url, FALSE);
+ $url = elgg_add_action_tokens_to_url($url, false);
unset($vars['is_action']);
}

0 comments on commit 3b280cf

Please sign in to comment.
Something went wrong with that request. Please try again.