From 957a09f7b6af9f92fb9367adceaf8d903359e919 Mon Sep 17 00:00:00 2001
From: KFCSpike <KFCSpike@outlook.com>
Date: Sat, 7 Dec 2013 06:18:13 +0000
Subject: [PATCH] Correctly show Oasis or the Village Name

---
 Templates/goldClub/farmlist.tpl | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Templates/goldClub/farmlist.tpl b/Templates/goldClub/farmlist.tpl
index 3ff93691..41f7ee1a 100644
--- a/Templates/goldClub/farmlist.tpl
+++ b/Templates/goldClub/farmlist.tpl
@@ -96,19 +96,20 @@ $vdata = $database->getVillage($towref);
                 <?php
                     $oasistype = $database->getVillageType2($towref);
                     if($oasistype != 0){
+                        $thisVillageName = 'Oasis';
+                    }
+                    else
+                    {
+                        $thisVillageName = $vdata["name"];
+                    }
                 ?>
                 <span class="coordinates coordinatesWithText">
-                <span class="coordText">Oasis</span>
+                <span class="coordText"><?php echo $thisVillageName; ?></span>
                 <span class="coordinatesWrapper">
                 <span class="coordinateY">(<?php echo $x; ?></span>
                 <span class="coordinatePipe">|</span>
                 <span class="coordinateX"><?php echo $y; ?>)</span>
-                </span></span><?php;}else{?>
-                <span class="coordinates coordinatesWithText">
-                <span class="coordText"><?php echo $vdata['name']; ?></span>
-                </span>
-                <?php } ?>
-                
+                </span></span>
                 <span class="clear">‎</span>
                 </label>
             </td>