diff options
| author | fisharebest <fisharebest@gmail.com> | 2010-10-07 07:25:01 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2010-10-07 07:25:01 +0000 |
| commit | 3425b39cd7801464179200036dae16b3327ffa4c (patch) | |
| tree | 3c15dee32d79a31171329a705f851fe3a41f1cd4 /includes/controllers | |
| parent | f7c5731937a552f0a028c057b064fae79248be85 (diff) | |
| download | webtrees-3425b39cd7801464179200036dae16b3327ffa4c.tar.gz webtrees-3425b39cd7801464179200036dae16b3327ffa4c.tar.bz2 webtrees-3425b39cd7801464179200036dae16b3327ffa4c.zip | |
Remove unnecessary character set checks
Diffstat (limited to 'includes/controllers')
| -rw-r--r-- | includes/controllers/individual_ctrl.php | 4 | ||||
| -rw-r--r-- | includes/controllers/search_ctrl.php | 2 |
2 files changed, 3 insertions, 3 deletions
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"])) { |