From 81a5a527ecdf7ad1a092e1f81b5ad1b5589f06a6 Mon Sep 17 00:00:00 2001
From: Sarjuuk <junkdump@gmx.net>
Date: Sat, 6 Jun 2015 20:53:25 +0200
Subject: [PATCH] - removed unnessecary limit from displayed creatures/objects
 per zone - check if g_pageInfo exists, before attempting to overwrite it

---
 pages/zone.php                 | 2 +-
 template/bricks/mapper.tpl.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/zone.php b/pages/zone.php
index e34ac0dc..a56fe2ee 100644
--- a/pages/zone.php
+++ b/pages/zone.php
@@ -170,7 +170,7 @@ class ZonePage extends GenericPage
         $oSpawns = DB::Aowow()->select('SELECT * FROM ?_spawns WHERE areaId = ?d AND type = ?d', $this->typeId, TYPE_OBJECT);
         $cSpawns = DB::Aowow()->select('SELECT * FROM ?_spawns WHERE areaId = ?d AND type = ?d', $this->typeId, TYPE_NPC);
 
-        $conditions = [['s.areaId', $this->typeId]];
+        $conditions = [CFG_SQL_LIMIT_NONE, ['s.areaId', $this->typeId]];
         if (!User::isInGroup(U_GROUP_STAFF))
             $conditions[] = [['cuFlags', CUSTOM_EXCLUDE_FOR_LISTVIEW, '&'], 0];
 
diff --git a/template/bricks/mapper.tpl.php b/template/bricks/mapper.tpl.php
index d10a078f..06f712fc 100644
--- a/template/bricks/mapper.tpl.php
+++ b/template/bricks/mapper.tpl.php
@@ -51,7 +51,7 @@ elseif (!empty($this->map['data'])):
             <script type="text/javascript">//<![CDATA[
 <?php
     if (!empty($this->map['data']['zone'])):
-        echo "                $.extend(g_pageInfo, {id: ".$this->map['data']['zone']."});\n";
+        echo "                ".(!empty($this->gPageInfo) ? "$.extend(g_pageInfo, {id: ".$this->map['data']['zone']."})" : "var g_pageInfo = {id: ".$this->map['data']['zone']."}").";\n";
     elseif (!empty($this->map['mapperData'])):
         echo "                var g_mapperData = ".json_encode($this->map['mapperData'], JSON_NUMERIC_CHECK).";\n";
     endif;