Fix htmlentities calls not using UTF8

Related to ushahidi#908
rjmackay · Oct 24, 2012 · 045dcd1 · 045dcd1
1 parent 6450be9
commit 045dcd1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/application/views/admin/manage/categories/main.php b/application/views/admin/manage/categories/main.php
@@ -211,9 +211,9 @@
 												<?php if($category_trusted == 1) { ?>
 												<div class="right">
 													<?php if($category_id == '4') { ?>
-													<a href="#" class="tooltip" title="<?php echo htmlentities(Kohana::lang('ui_admin.special_category_explanation'),ENT_QUOTES);?>"><strong><?php echo Kohana::lang('ui_admin.special_category');?></strong></a>
+													<a href="#" class="tooltip" title="<?php echo htmlentities(Kohana::lang('ui_admin.special_category_explanation'),ENT_QUOTES, "UTF-8");?>"><strong><?php echo Kohana::lang('ui_admin.special_category');?></strong></a>
 													<?php } else {?>
-														<a href="#" class="tooltip" title="<?php echo htmlentities(Kohana::lang('ui_admin.none_category_explanation'),ENT_QUOTES); ?>"><strong><?php echo Kohana::lang('ui_admin.special_category');?></strong></a>
+														<a href="#" class="tooltip" title="<?php echo htmlentities(Kohana::lang('ui_admin.none_category_explanation'),ENT_QUOTES, "UTF-8"); ?>"><strong><?php echo Kohana::lang('ui_admin.special_category');?></strong></a>
 													<?php } ?>
 												</div>
 												<?php } ?>

diff --git a/application/views/header_nav.php b/application/views/header_nav.php
@@ -13,7 +13,7 @@
 		<li class="header_nav_user header_nav_has_dropdown">
 		<?php if($loggedin_user != FALSE){ ?>
 
-			<a href="<?php echo url::site().$loggedin_role;?>"><span class="header_nav_label"><?php echo htmlentities($loggedin_user->username); ?></span> <img alt="<?php echo htmlentities($loggedin_user->username, ENT_QUOTES, "UTF-8"); ?>" src="<?php echo htmlentities(members::gravatar($loggedin_user->email, 20), ENT_QUOTES); ?>" width="20" /></a>
+			<a href="<?php echo url::site().$loggedin_role;?>"><span class="header_nav_label"><?php echo htmlentities($loggedin_user->username, ENT_QUOTES, "UTF-8"); ?></span> <img alt="<?php echo htmlentities($loggedin_user->username, ENT_QUOTES, "UTF-8"); ?>" src="<?php echo htmlentities(members::gravatar($loggedin_user->email, 20), ENT_QUOTES); ?>" width="20" /></a>
 
 			<ul class="header_nav_dropdown" style="display:none;">
 			<?php if($loggedin_role != ""){ ?>