TDB 6.0.1 - 2015/03/21TDB6.01

Closes #13816
Closes #13792

Ref #14139

2 files changed, 8 insertions, 2 deletions

diff --git a/src/server/shared/Database/DatabaseLoader.h b/src/server/shared/Database/DatabaseLoader.h
index 0d31ef1686c..3bbf7e75771 100644
--- a/src/server/shared/Database/DatabaseLoader.h
+++ b/src/server/shared/Database/DatabaseLoader.h
@@ -60,9 +60,9 @@ private:
 
     static bool Process(std::stack<Predicate>& stack);
 
+    std::string const _logger;
     bool const _autoSetup;
     uint32 const _updateFlags;
-    std::string const _logger;
 
     std::stack<std::pair<Predicate, std::function<void()>>> _open;
     std::stack<std::function<void()>> _close;
diff --git a/src/server/shared/Updater/DBUpdater.cpp b/src/server/shared/Updater/DBUpdater.cpp
index 68c8b76e3f7..156c2a8fdd4 100644
--- a/src/server/shared/Updater/DBUpdater.cpp
+++ b/src/server/shared/Updater/DBUpdater.cpp
@@ -154,7 +154,7 @@ std::string DBUpdater<HotfixDatabaseConnection>::GetTableName()
 template<>
 std::string DBUpdater<HotfixDatabaseConnection>::GetBaseFile()
 {
-    return DBUpdater<HotfixDatabaseConnection>::GetSourceDirectory() + "/sql/base/hotfixes_database.sql";
+    return _HOTFIXES_DATABASE;
 }
 
 template<>
@@ -164,6 +164,12 @@ bool DBUpdater<HotfixDatabaseConnection>::IsEnabled(uint32 const updateMask)
     return (updateMask & DatabaseLoader::DATABASE_HOTFIX) ? true : false;
 }
 
+template<>
+BaseLocation DBUpdater<HotfixDatabaseConnection>::GetBaseLocationType()
+{
+    return LOCATION_DOWNLOAD;
+}
+
 // All
 template<class T>
 BaseLocation DBUpdater<T>::GetBaseLocationType()