Remaining htmlentities calls converted to utf-8

git-svn-id: https://code.elgg.org/elgg/trunk@1805 36083f99-b078-4883-b0ff-0f9b5a30f544

6 files changed, 6 insertions, 6 deletions

diff --git a/mod/guidtool/views/default/forms/guidtool/export.php b/mod/guidtool/views/default/forms/guidtool/export.php
index cb92991a2..6825984dc 100644
--- a/mod/guidtool/views/default/forms/guidtool/export.php
+++ b/mod/guidtool/views/default/forms/guidtool/export.php
@@ -19,5 +19,5 @@
 	
 ?>
 <div id="export">
-<?php echo elgg_view('output/longtext', array('value' => htmlentities(file_get_contents($CONFIG->url . "export/$format/$entity_guid/")))) ?>
+<?php echo elgg_view('output/longtext', array('value' => htmlentities(file_get_contents($CONFIG->url . "export/$format/$entity_guid/"), null, 'UTF-8'))) ?>
 </div>
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/icon.php b/mod/profile/views/default/profile/icon.php
index 25597101c..8424f4c3f 100644
--- a/mod/profile/views/default/profile/icon.php
+++ b/mod/profile/views/default/profile/icon.php
@@ -19,7 +19,7 @@
 

 		if ($vars['entity'] instanceof ElggUser) {

 			

-		$name = htmlentities($vars['entity']->name);

+		$name = htmlentities($vars['entity']->name, null, 'UTF-8');

 		$username = $vars['entity']->username;

 		

 		if ($icontime = $vars['entity']->icontime) {

diff --git a/views/default/canvas/layouts/widgets.php b/views/default/canvas/layouts/widgets.php
index 4305248b3..f31cde92c 100644
--- a/views/default/canvas/layouts/widgets.php
+++ b/views/default/canvas/layouts/widgets.php
@@ -51,7 +51,7 @@
 		<input type="hidden" name="side" value="<?php echo in_array('side',$widgettypes[$widget->handler]->positions); ?>" />
 		<input type="hidden" name="main" value="<?php echo in_array('main',$widgettypes[$widget->handler]->positions); ?>" />
 		<input type="hidden" name="handler" value="<?php echo htmlentities($handler); ?>" />
-		<input type="hidden" name="description" value="<?php echo htmlentities($widget->description); ?>" />
+		<input type="hidden" name="description" value="<?php echo htmlentities($widget->description, null, 'UTF-8'); ?>" />
 		<input type="hidden" name="guid" value="0" />
 	</h3>
 </td>
diff --git a/views/default/input/button.php b/views/default/input/button.php
index e646998ea..af4fa2c9d 100644
--- a/views/default/input/button.php
+++ b/views/default/input/button.php
@@ -33,7 +33,7 @@
 		default: $type = 'submit';
 	}
 	
-	$value = htmlentities($vars['value']);
+	$value = htmlentities($vars['value'], null, '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/default/messages/exceptions/exception.php b/views/default/messages/exceptions/exception.php
index de178eda7..a484c6bee 100644
--- a/views/default/messages/exceptions/exception.php
+++ b/views/default/messages/exceptions/exception.php
@@ -29,7 +29,7 @@ END;
 
 	if ($CONFIG->debug)
 	{
-		$details = autop(htmlentities(print_r($vars['object'], true)));
+		$details = autop(htmlentities(print_r($vars['object'], true), null, 'UTF-8'));
 		$body .= <<< END
 		<hr />
 		<p class="messages-exception-detail">
diff --git a/views/failsafe/messages/exceptions/exception.php b/views/failsafe/messages/exceptions/exception.php
index 61c4a8937..5b637ad95 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 autop(htmlentities(print_r($vars['object'], true)));
+			echo autop(htmlentities(print_r($vars['object'], true), null, 'UTF-8'));
 		
 		?>
 	</p>