Merge branch 'master' into 330

src/shared/Common.h

@@ -164,6 +164,7 @@ enum TimeConstants
     MINUTE = 60,
     HOUR   = MINUTE*60,
     DAY    = HOUR*24,
+    WEEK   = DAY*7,
     MONTH  = DAY*30,
     YEAR   = MONTH*12,
     IN_MILLISECONDS = 1000

src/shared/Util.h

@@ -191,6 +191,24 @@ inline bool isNumericOrSpace(wchar_t wchar)
     return isNumeric(wchar) || wchar == L' ';
 }
 
+inline bool isNumeric(std::string const& str)
+{
+    for(std::string::const_iterator itr = str.begin(); itr != str.end(); ++itr)
+        if (!isNumeric(*itr))
+            return false;
+
+    return true;
+}
+
+inline bool isNumeric(std::wstring const& str)
+{
+    for(std::wstring::const_iterator itr = str.begin(); itr != str.end(); ++itr)
+        if (!isNumeric(*itr))
+            return false;
+
+    return true;
+}
+
 inline bool isBasicLatinString(std::wstring wstr, bool numericOrSpace)
 {
     for(size_t i = 0; i < wstr.size(); ++i)

src/shared/revision_nr.h

@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "9673"
+ #define REVISION_NR "9688"
 #endif // __REVISION_NR_H__

src/shared/revision_sql.h

@@ -1,6 +1,6 @@
 #ifndef __REVISION_SQL_H__
 #define __REVISION_SQL_H__
- #define REVISION_DB_CHARACTERS "required_9661_01_characters_character_talent"
+ #define REVISION_DB_CHARACTERS "required_9687_01_characters_character_queststatus_daily"
  #define REVISION_DB_MANGOS "required_9663_01_mangos_mangos_string"
  #define REVISION_DB_REALMD "required_9010_01_realmd_realmlist"
 #endif // __REVISION_SQL_H__