From 3425b39cd7801464179200036dae16b3327ffa4c Mon Sep 17 00:00:00 2001
From: fisharebest <fisharebest@gmail.com>
Date: Thu, 7 Oct 2010 07:25:01 +0000
Subject: Remove unnecessary character set checks

---
 includes/controllers/individual_ctrl.php | 4 ++--
 includes/controllers/search_ctrl.php     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'includes/controllers')

diff --git a/includes/controllers/individual_ctrl.php b/includes/controllers/individual_ctrl.php
index 8119715905..c842fabc4e 100644
--- a/includes/controllers/individual_ctrl.php
+++ b/includes/controllers/individual_ctrl.php
@@ -318,13 +318,13 @@ class IndividualController extends BaseController {
 
 					$name = $this->indi->getFullName();
 					if (WT_USE_LIGHTBOX) {
-						print "<a href=\"" . $firstmediarec["file"] . "\" rel=\"clearbox[general_1]\" rev=\"" . $mid . "::" . $GEDCOM . "::" . PrintReady(htmlspecialchars($name, ENT_QUOTES, 'UTF-8')) . "\">" . "\n";
+						print "<a href=\"" . $firstmediarec["file"] . "\" rel=\"clearbox[general_1]\" rev=\"" . $mid . "::" . $GEDCOM . "::" . PrintReady(htmlspecialchars($name)) . "\">" . "\n";
 					} else if (!$USE_MEDIA_VIEWER && $imgsize) {
 						$result .= "<a href=\"javascript:;\" onclick=\"return openImage('".urlencode($firstmediarec["file"])."', $imgwidth, $imgheight);\">";
 					} else {
 						$result .= "<a href=\"mediaviewer.php?mid={$mid}\">";
 					}
-					$result .= "<img src=\"$filename\" align=\"left\" class=\"".$class."\" border=\"none\" title=\"".PrintReady(htmlspecialchars(strip_tags($name), ENT_QUOTES, 'UTF-8'))."\" alt=\"".PrintReady(htmlspecialchars(strip_tags($name), ENT_QUOTES, 'UTF-8'))."\" />";
+					$result .= "<img src=\"$filename\" align=\"left\" class=\"".$class."\" border=\"none\" title=\"".PrintReady(htmlspecialchars(strip_tags($name)))."\" alt=\"".PrintReady(htmlspecialchars(strip_tags($name)))."\" />";
 					$result .= "</a>";
 					return $result;
 				}
diff --git a/includes/controllers/search_ctrl.php b/includes/controllers/search_ctrl.php
index 35e126cde8..e06af63d9b 100644
--- a/includes/controllers/search_ctrl.php
+++ b/includes/controllers/search_ctrl.php
@@ -121,7 +121,7 @@ class SearchController extends BaseController {
 				$this->myquery="";
 			} else {
 				$this->query = $_REQUEST["query"];
-				$this->myquery = htmlspecialchars($this->query,ENT_COMPAT,'UTF-8');
+				$this->myquery = htmlspecialchars($this->query);
 			}
 		}
 		if (isset ($_REQUEST["replace"])) {
-- 
cgit v1.3