From 3be71c2eaf8847d136cb8dc591a9cb0fb10b7a25 Mon Sep 17 00:00:00 2001
From: unknown <Idan@Idan-Laptop.(none)>
Date: Sun, 24 Jun 2012 13:55:49 +0300
Subject: [PATCH] more fixes

---
 GameEngine/Automation.php | 2 +-
 Templates/Build/16_99.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php
index e853aab4..0b5df4cb 100644
--- a/GameEngine/Automation.php
+++ b/GameEngine/Automation.php
@@ -2197,7 +2197,7 @@ class Automation {
 						$database->setVillageField($data['to'],loyalty,($toF['loyalty']-$rand));
 					} else {
 					//you took over the village
-						$villname = $database->getVillageField($data['to'],"name");
+						$villname = addslashes($database->getVillageField($data['to'],"name"));
 						$artifact = $database->getOwnArtefactInfo($data['to']);
 						$info_chief = "".$chief_pic.",Inhabitants of ".$villname." village decided to join your empire.";
 						if ($artifact['vref'] == $data['to']){
diff --git a/Templates/Build/16_99.tpl b/Templates/Build/16_99.tpl
index 172472b9..0d604d11 100644
--- a/Templates/Build/16_99.tpl
+++ b/Templates/Build/16_99.tpl
@@ -70,7 +70,7 @@ if(!$session->goldclub) {
 					
 </tr>
 <tr>
-<div class="clear"></div><p><input type="image" value="ok" name="s1" id="btn_ok" class="dynamic_img" src="img/x.gif" tabindex="8" alt="OK" <?php if(!$market->merchantAvail()) { echo "DISABLED"; }?>/></p></form>
+<div class="clear"></div><p><input type="image" value="ok" name="s1" id="btn_ok" class="dynamic_img" src="img/x.gif" tabindex="8" alt="OK"/></p></form>
 </tr>
 </form>
 <?php } ?>