aboutsummaryrefslogtreecommitdiff
path: root/views/failsafe
diff options
context:
space:
mode:
authormarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-02-27 13:33:16 +0000
committermarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-02-27 13:33:16 +0000
commite658fb3a978e40653d72ef33549177c87cb714ce (patch)
treeea2d6915df13ff06b36960cf39e3e91bbee14b50 /views/failsafe
parentd318c0249ea50907b8b3cbac3a6a6293abf2c0d7 (diff)
downloadelgg-e658fb3a978e40653d72ef33549177c87cb714ce.tar.gz
elgg-e658fb3a978e40653d72ef33549177c87cb714ce.tar.bz2
Closes #651: I agree, changed to convert both quotes.
git-svn-id: https://code.elgg.org/elgg/trunk@2979 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/failsafe')
-rw-r--r--views/failsafe/input/button.php2
-rw-r--r--views/failsafe/input/checkboxes.php2
-rw-r--r--views/failsafe/input/hidden.php2
-rw-r--r--views/failsafe/input/text.php2
-rw-r--r--views/failsafe/messages/exceptions/exception.php2
5 files changed, 5 insertions, 5 deletions
diff --git a/views/failsafe/input/button.php b/views/failsafe/input/button.php
index ac1bfe784..4d0da9b72 100644
--- a/views/failsafe/input/button.php
+++ b/views/failsafe/input/button.php
@@ -33,7 +33,7 @@
default: $type = 'submit';
}
- $value = htmlentities($vars['value'], null, 'UTF-8');
+ $value = htmlentities($vars['value'], ENT_QUOTES, 'UTF-8');
$name = $vars['internalname'];
$src = $vars['src'];
if (strpos($src,$CONFIG->wwwroot)===false) $src = ""; // blank src if trying to access an offsite image.
diff --git a/views/failsafe/input/checkboxes.php b/views/failsafe/input/checkboxes.php
index ccfa17982..a66b2a084 100644
--- a/views/failsafe/input/checkboxes.php
+++ b/views/failsafe/input/checkboxes.php
@@ -43,7 +43,7 @@
$disabled = "";
if ($vars['disabled']) $disabled = ' disabled="yes" ';
- echo "<label><input type=\"checkbox\" $disabled {$vars['js']} name=\"{$vars['internalname']}[]\" {$selected} value=\"".htmlentities($option, null, 'UTF-8')."\" {$selected} class=\"$class\" />{$label}</label><br />";
+ echo "<label><input type=\"checkbox\" $disabled {$vars['js']} name=\"{$vars['internalname']}[]\" {$selected} value=\"".htmlentities($option, ENT_QUOTES, 'UTF-8')."\" {$selected} class=\"$class\" />{$label}</label><br />";
}
?> \ No newline at end of file
diff --git a/views/failsafe/input/hidden.php b/views/failsafe/input/hidden.php
index 5d3015414..6fcd56e4a 100644
--- a/views/failsafe/input/hidden.php
+++ b/views/failsafe/input/hidden.php
@@ -17,4 +17,4 @@
*
*/
?>
-<input type="hidden" <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" value="<?php echo htmlentities($vars['value'], null, 'UTF-8'); ?>" /> \ No newline at end of file
+<input type="hidden" <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" /> \ No newline at end of file
diff --git a/views/failsafe/input/text.php b/views/failsafe/input/text.php
index 9f8ab79f7..94559afd6 100644
--- a/views/failsafe/input/text.php
+++ b/views/failsafe/input/text.php
@@ -24,4 +24,4 @@
?>
-<input type="text" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" value="<?php echo htmlentities($vars['value'], null, 'UTF-8'); ?>" class="<?php echo $class ?>"/> \ No newline at end of file
+<input type="text" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" class="<?php echo $class ?>"/> \ No newline at end of file
diff --git a/views/failsafe/messages/exceptions/exception.php b/views/failsafe/messages/exceptions/exception.php
index c36be0baa..91fe35928 100644
--- a/views/failsafe/messages/exceptions/exception.php
+++ b/views/failsafe/messages/exceptions/exception.php
@@ -32,7 +32,7 @@
<p class="messages-exception-detail" style="background:#FDFFC3;display:block;padding:10px;">
<?php
- echo nl2br(htmlentities(print_r($vars['object'], true), null, 'UTF-8'));
+ echo nl2br(htmlentities(print_r($vars['object'], true), ENT_QUOTES, 'UTF-8'));
?>
</p>