patched database.inc
Merge pull request #39 from Svendborg/h/SA-CORE-2014-005-D7

patched database.inc