4 files changed, 4 insertions, 4 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