ddfdfMerge branch 'master' of https://github.com/Aevann1/Drama

drama/helpers/wrappers.py

@@ -26,7 +26,7 @@ def get_logged_in_user():
 		uid = session.get("user_id")
 		nonce = session.get("login_nonce", 0)
 		if not uid: x= (None, None)
-		v = db.query(User).filter_by(id=uid).first()
+		v = g.db.query(User).filter_by(id=uid).first()
 
 		if v and v.agendaposter_expires_utc and v.agendaposter_expires_utc < g.timestamp:
 			v.agendaposter_expires_utc = 0