aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-13 12:34:09 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-13 12:34:09 +0000
commit3b280cf0fdb3b08ab91a32e491f73bdb0ee2c96c (patch)
tree3bcb467ac265aa07078b6831da65a0a8973ef86b /views
parent0f15382843a749b3482722493ec74fba5d38e6e8 (diff)
downloadelgg-3b280cf0fdb3b08ab91a32e491f73bdb0ee2c96c.tar.gz
elgg-3b280cf0fdb3b08ab91a32e491f73bdb0ee2c96c.tar.bz2
Fixed #2218 finished up the encoding issues by turning of double encoding
git-svn-id: http://code.elgg.org/elgg/trunk@8199 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views')
-rw-r--r--views/default/output/confirmlink.php2
-rw-r--r--views/default/output/dropdown.php2
-rw-r--r--views/default/output/email.php2
-rw-r--r--views/default/output/pulldown.php4
-rw-r--r--views/default/output/radio.php2
-rw-r--r--views/default/output/text.php2
-rw-r--r--views/default/output/url.php6
7 files changed, 10 insertions, 10 deletions
diff --git a/views/default/output/confirmlink.php b/views/default/output/confirmlink.php
index 28facc26c..9325f0eb6 100644
--- a/views/default/output/confirmlink.php
+++ b/views/default/output/confirmlink.php
@@ -21,7 +21,7 @@ $vars['href'] = elgg_add_action_tokens_to_url(elgg_normalize_url($vars['href']),
$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) . "')";
diff --git a/views/default/output/dropdown.php b/views/default/output/dropdown.php
index 691382734..8d68508ca 100644
--- a/views/default/output/dropdown.php
+++ b/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);
diff --git a/views/default/output/email.php b/views/default/output/email.php
index 8f5c092b9..00eefad1f 100644
--- a/views/default/output/email.php
+++ b/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>";
} \ No newline at end of file
diff --git a/views/default/output/pulldown.php b/views/default/output/pulldown.php
index 2d5468409..7097a9a8d 100644
--- a/views/default/output/pulldown.php
+++ b/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'); \ No newline at end of file
+echo elgg_view('output/dropdown', $vars); \ No newline at end of file
diff --git a/views/default/output/radio.php b/views/default/output/radio.php
index dd3198b6d..0fae9977b 100644
--- a/views/default/output/radio.php
+++ b/views/default/output/radio.php
@@ -10,4 +10,4 @@
*
*/
-echo elgg_view('output/text',$vars); \ No newline at end of file
+echo elgg_view('output/text', $vars); \ No newline at end of file
diff --git a/views/default/output/text.php b/views/default/output/text.php
index f95e2d7fd..2c9242c1d 100644
--- a/views/default/output/text.php
+++ b/views/default/output/text.php
@@ -10,4 +10,4 @@
*
*/
-echo htmlspecialchars($vars['value'], ENT_QUOTES, 'UTF-8'); // $vars['value']; \ No newline at end of file
+echo htmlspecialchars($vars['value'], ENT_QUOTES, 'UTF-8', false); \ No newline at end of file
diff --git a/views/default/output/url.php b/views/default/output/url.php
index 4f34c120e..19277f08f 100644
--- a/views/default/output/url.php
+++ b/views/default/output/url.php
@@ -21,13 +21,13 @@ if (!$url and isset($vars['value'])) {
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 @@ if ($url) {
$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']);
}