From f4dc572e7021f134f2ed9fedc16634d56edcc689 Mon Sep 17 00:00:00 2001
From: hexcoded <hexcoded@gmail.com>
Date: Tue, 4 Jun 2013 11:21:19 +0300
Subject: [PATCH] Occupied/Unoccupied Oasis name fix

Fix the name of Oasis.The own Oasis is show like Unoccupied after when we try to send troops etc.

from:
$otext = ($basearray['occupied'] == 1)? "occupied" : "unoccupied";
to
$otext = ($oasis['name']);


from:
"<a href=\"a2b.php?z=".$_GET['d']."&o\">&raquo; Raid $otext oasis.</a>" :
to:
"<a href=\"a2b.php?z=".$_GET['d']."&o\">&raquo; Raid $otext .</a>" :
---
 Templates/Map/vilview.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Templates/Map/vilview.tpl b/Templates/Map/vilview.tpl
index 87904918..6b9a4146 100644
--- a/Templates/Map/vilview.tpl
+++ b/Templates/Map/vilview.tpl
@@ -469,7 +469,7 @@ if($type==18 or $type==19 or $type==20 or $type==21){
         $enough_cp = false;
       }
       
-			$otext = ($basearray['occupied'] == 1)? "occupied" : "unoccupied"; 
+			$otext = ($oasis['name']); 
 			if($village->unitarray['u'.$session->tribe.'0'] >= 3 AND $enough_cp) {
         $test = "<a href=\"a2b.php?id=".$_GET['d']."&amp;s=1\">&raquo;  Found new village.</a>";
       } elseif($village->unitarray['u'.$session->tribe.'0'] >= 3 AND !$enough_cp) {
@@ -487,7 +487,7 @@ if($type==18 or $type==19 or $type==20 or $type==21){
 		"&raquo; Raid $otext oasis. (build a rally point)" : 
 		
 		
-		"<a href=\"a2b.php?z=".$_GET['d']."&o\">&raquo; Raid $otext oasis.</a>" :
+		"<a href=\"a2b.php?z=".$_GET['d']."&o\">&raquo; Raid $otext.</a>" :
 		"$test"
 			?>
 		</tr>