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

diff --git a/views/default/output/confirmlink.php b/views/default/output/confirmlink.php
index 28facc26c7dc452f9214bbde8e20a0258662ea83..9325f0eb64d5c38fec53a34d9fd395f18b86e9fe 100644 (file)
--- 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 6913827346c5b39a17cd194595f1d43c5bde8ce3..8d68508ca700acaf1edab7d54f0036f46285bc8f 100644 (file)
--- 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 8f5c092b9931bae8baf5da6e28d3bca1e4d88baf..00eefad1f1b76a2faf2f4203b512c3befaa40d1b 100644 (file)
--- 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 2d5468409e5226f5a0cfc3084f345a0f504d8b00..7097a9a8d0cc526defac3a9ccb96b40a1a549184 100644 (file)
--- 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 dd3198b6d01c1fb88d008ab15e20c9576a24aef0..0fae9977b1ad67f633cf6e0d1d07bac900fef86e 100644 (file)
--- 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 f95e2d7fd7602b7270182a3d285ee1965f45c5e3..2c9242c1d428c1bf6550813d451909dea1b49baf 100644 (file)
--- 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 4f34c120e092a45b8edba0e2dd5a9365391bc1be..19277f08f7f8955e7993b4504b61409b2bc9e2d0 100644 (file)
--- 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']);
        }