Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x

src/server/game/Guilds/Guild.cpp

@@ -2093,7 +2093,7 @@ bool Guild::AddMember(uint64 guid, uint8 rankId)
         if (player->GetGuildId() != 0)
             return false;
     }
-    else if (Player::GetGuildIdFromGuid(guid) != 0)
+    else if (Player::GetGuildIdFromDB(guid) != 0)
         return false;
 
     // Remove all player signs from another petitions