From 9a41739f9bae59ee368568b16924b2cf0b12a601 Mon Sep 17 00:00:00 2001
From: Shadow <cata7007@gmail.com>
Date: Sun, 8 Dec 2013 09:33:41 +0200
Subject: [PATCH] Update 7.tpl

---
 Templates/Notice/7.tpl | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Templates/Notice/7.tpl b/Templates/Notice/7.tpl
index b2be4508..1b4d43fc 100644
--- a/Templates/Notice/7.tpl
+++ b/Templates/Notice/7.tpl
@@ -24,10 +24,12 @@ if ($database->getUserField($dataarray[28],'username',0)!="??") {
 }else{
 	$defuser_url="<font color=\"grey\"><b>??</b></font>";
 }
-if($database->getVillageField($dataarray[29],'name')!="??") {
-	$deffrom_url="<a href=\"karte.php?d=".$dataarray[29]."&c=".$generator->getMapCheck($dataarray[29])."\">".$database->getVillageField($dataarray[29],'name')."</a>";
+if($database->isVillageOases($dataarray[29])){
+    $deffrom_url="<a href=\"karte.php?d=".$dataarray[29]."&c=".$generator->getMapCheck($dataarray[29])."\">".$dataarray[30]."</a>";
+}elseif($database->getVillageField($dataarray[29],'name')!="??") {
+    $deffrom_url="<a href=\"karte.php?d=".$dataarray[29]."&c=".$generator->getMapCheck($dataarray[29])."\">".$database->getVillageField($dataarray[29],'name')."</a>";
 }else{
-	$deffrom_url="<font color=\"grey\"><b>??</b></font>";
+    $deffrom_url="<font color=\"grey\"><b>??</b></font>";
 }
 ?>
 <table cellpadding="1" cellspacing="1" id="report_surround">