= $item->resize_img(array("id" => "gPhotoId-{$item->id}", "class" => "gResize")) ?>
diff --git a/modules/tagfaces/views/drawfaces_highlight_block.html.php b/modules/tagfaces/views/drawfaces_highlight_block.html.php
index a671f1f9..e88adf51 100644
--- a/modules/tagfaces/views/drawfaces_highlight_block.html.php
+++ b/modules/tagfaces/views/drawfaces_highlight_block.html.php
@@ -83,7 +83,11 @@
foreach ($existingFaces as $oneFace) {
$oneTag = ORM::factory("tag", $oneFace->tag_id)
?>
+<<<<<<< HEAD:modules/tagfaces/views/drawfaces_highlight_block.html.php
tag_id") ?>" title="=p::clean($oneTag->name); ?>" alt="=p::clean($oneTag->name); ?>" onMouseOver="highlightbox(=$oneFace->x1 ?>,=$oneFace->y1 ?>,=$oneFace->x2 ?>,=$oneFace->y2 ?>,'=p::clean($oneTag->name); ?>', '=p::clean($oneFace->description); ?>', '=url::site("tags/$oneFace->tag_id") ?>')" />
+=======
+
tag_id") ?>" title="=html::clean($oneTag->name); ?>" alt="=$oneTag->name; ?>" onMouseOver="highlightbox(=$oneFace->x1 ?>,=$oneFace->y1 ?>,=$oneFace->x2 ?>,=$oneFace->y2 ?>,'=html::clean($oneTag->name); ?>')" onMouseOut="hidebox()" />
+>>>>>>> gallery3-contrib/master:modules/tagfaces/views/drawfaces_highlight_block.html.php
} ?>
diff --git a/modules/tagsmap/views/admin_tagsmap.html.php b/modules/tagsmap/views/admin_tagsmap.html.php
index 4d79a17a..3136e35a 100644
--- a/modules/tagsmap/views/admin_tagsmap.html.php
+++ b/modules/tagsmap/views/admin_tagsmap.html.php
@@ -42,7 +42,7 @@
endif ?>
- = p::clean($tag->name) ?>
+ = html::clean($tag->name) ?>
(= $tag->count ?>)
id") ?>">= t("Edit GPS") ?>