* Fix CRLF and no newline in a couple of sqls

* Slight change to update loop to ensure expired auctions are't left in AH.

--HG--
branch : trunk

3 files changed, 5 insertions, 11 deletions

diff --git a/sql/updates/5866_gameobject_template.sql b/sql/updates/5866_gameobject_template.sql
index 26f89e1d354..cc31e49aae8 100644
--- a/sql/updates/5866_gameobject_template.sql
+++ b/sql/updates/5866_gameobject_template.sql
@@ -1 +1,2 @@
-UPDATE `gameobject_template` SET `type`='10',`data0`='0',`ScriptName`='go_wg2voa_portal' WHERE (`entry`='190763');

+UPDATE `gameobject_template` SET `type`='10',`data0`='0',`ScriptName`='go_wg2voa_portal' WHERE (`entry`='190763');
+
diff --git a/sql/updates/5868_world.sql b/sql/updates/5868_world.sql
index 117cc8cee6b..93aabe19a03 100644
--- a/sql/updates/5868_world.sql
+++ b/sql/updates/5868_world.sql
@@ -1,4 +1,4 @@
 UPDATE  `gameobject_template` SET  `ScriptName` =  'go_matrix_punchograph' WHERE  `gameobject_template`.`entry` =142345 LIMIT 1 ;
 UPDATE  `gameobject_template` SET  `ScriptName` =  'go_matrix_punchograph' WHERE  `gameobject_template`.`entry` =142475 LIMIT 1 ;
 UPDATE  `gameobject_template` SET  `ScriptName` =  'go_matrix_punchograph' WHERE  `gameobject_template`.`entry` =142476 LIMIT 1 ;
-UPDATE  `gameobject_template` SET  `ScriptName` =  'go_matrix_punchograph' WHERE  `gameobject_template`.`entry` =142696 LIMIT 1 ;
\ No newline at end of file
+UPDATE  `gameobject_template` SET  `ScriptName` =  'go_matrix_punchograph' WHERE  `gameobject_template`.`entry` =142696 LIMIT 1 ;
diff --git a/src/game/AuctionHouseMgr.cpp b/src/game/AuctionHouseMgr.cpp
index 635d56e4bf5..ffc0c55d9d3 100644
--- a/src/game/AuctionHouseMgr.cpp
+++ b/src/game/AuctionHouseMgr.cpp
@@ -506,7 +506,7 @@ void AuctionHouseObject::Update()
     if (AuctionsMap.empty())
         return;
 
-    QueryResult* result = CharacterDatabase.PQuery("SELECT id FROM auctionhouse WHERE time <= %u ORDER BY TIME ASC", (uint32)curTime);
+    QueryResult* result = CharacterDatabase.PQuery("SELECT id FROM auctionhouse WHERE time <= %u ORDER BY TIME ASC", (uint32)curTime+60);
 
     if (!result)
     {
@@ -530,15 +530,8 @@ void AuctionHouseObject::Update()
     delete result;
 
     vector<uint32>::iterator iter = expiredAuctions.begin();
-    for (uint32 count = 1;count <= 50;++count)
+    while (!expiredAuctions.empty())
     {
-        // Do we have any expired auctions? If not, stop here.
-        if (expiredAuctions.empty())
-        {
-            count = 50;
-            continue;
-        }
-
         // from auctionhousehandler.cpp, creates auction pointer & player pointer
         AuctionEntry* auction = GetAuction(*iter);