Allowing UTF-8 report titles. Closes #908

ushahidi · Oct 24, 2012 · 7a16e3e · 7a16e3e
1 parent 876f2fe
commit 7a16e3e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
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); ?>" 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); ?></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 != ""){ ?>

diff --git a/themes/default/views/reports/detail.php b/themes/default/views/reports/detail.php
@@ -14,7 +14,7 @@
   	  ?>
 
 		<h1 class="report-title"><?php
-			echo htmlentities($incident_title, ENT_QUOTES);
+			echo htmlentities($incident_title, ENT_QUOTES, "UTF-8");
 
 			// If Admin is Logged In - Allow For Edit Link
 			if ($logged_in)
@@ -78,7 +78,7 @@
 			echo '<div id="report-images">';
 			foreach ($incident_photos as $photo)
 			{
-				echo '<a class="photothumb" rel="lightbox-group1" href="'.$photo['large'].'"><img alt="'.htmlentities($incident_title, ENT_QUOTES).'" src="'.$photo['thumb'].'"/></a> ';
+				echo '<a class="photothumb" rel="lightbox-group1" href="'.$photo['large'].'"><img alt="'.htmlentities($incident_title, ENT_QUOTES, "UTF-8").'" src="'.$photo['thumb'].'"/></a> ';
 			};
 			echo '</div>';
 	    }

diff --git a/themes/default/views/reports/list.php b/themes/default/views/reports/list.php
@@ -88,7 +88,7 @@
 				<div id="incident_<?php echo $incident_id ?>" class="rb_report <?php echo $incident_verified_class; ?>">
 					<div class="r_media">
 						<p class="r_photo" style="text-align:center;"> <a href="<?php echo $incident_url; ?>">
-							<img alt="<?php echo htmlentities($incident_title, ENT_QUOTES); ?>" src="<?php echo $incident_thumb; ?>" style="max-width:89px;max-height:59px;" /> </a>
+							<img alt="<?php echo htmlentities($incident_title, ENT_QUOTES, "UTF-8"); ?>" src="<?php echo $incident_thumb; ?>" style="max-width:89px;max-height:59px;" /> </a>
 						</p>
 
 						<!-- Only show this if the report has a video -->
@@ -126,7 +126,7 @@
 
 					<div class="r_details">
 						<h3><a class="r_title" href="<?php echo $incident_url; ?>">
-								<?php echo htmlentities($incident_title); ?>
+								<?php echo htmlentities($incident_title, ENT_QUOTES, "UTF-8"); ?>
 							</a>
 							<a href="<?php echo "$incident_url#discussion"; ?>" class="r_comments">
 								<?php echo $comment_count; ?></a>