From 8b006b2a7805f72b36f5482bae7f5c995b99c02a Mon Sep 17 00:00:00 2001
From: Shadow <cata7007@gmail.com>
Date: Sun, 8 Dec 2013 09:34:11 +0200
Subject: [PATCH] Update 1.tpl

---
 Templates/Notice/1.tpl | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Templates/Notice/1.tpl b/Templates/Notice/1.tpl
index 25102ff0..72188e4a 100644
--- a/Templates/Notice/1.tpl
+++ b/Templates/Notice/1.tpl
@@ -19,10 +19,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">
@@ -375,4 +377,4 @@ for($i=129;$i<=138;$i++) {
 </tr></tbody></table>
 
 <?php } ?>
-</td></tr></tbody></table>
\ No newline at end of file
+</td></tr></tbody></table>