Merge branch 'master' of gitlab.rezometz.org:guimoz/roulette-legacy

Conflicts:
	roulette.py
This commit is contained in:
guimoz 2017-01-31 18:11:50 +01:00
commit 170e7a9e24

View file

@ -108,7 +108,7 @@ def get_player_from_full_name(firstname, name):
machines.id,machines.ip,players.ban_end machines.id,machines.ip,players.ban_end
from players from players
inner join machines on players.id=machines.player_id inner join machines on players.id=machines.player_id
where players.firstname=%s and players.name=%s"""% (firstname, name)) where players.firstname=\"%s\" and players.name=\"%s\""""% (firstname, name))
row = cur.fetchone() row = cur.fetchone()
con.close() con.close()