Changed query.php to db.php, added more mail checks
Changed query.php to db.php, added more mail checks
Merge remote-tracking branch 'origin/master'