gGetDb function
Merge branch 'master' into pdo-db
Revert "fix db error (I hope)"

This reverts commit 8a999a13ba82d6166a2b019db677e14d5b44db3e.
Revert "hack notifications to use helpmebot.org.uk's mysql server"

This reverts commit 854fe738a9dbff54db84beaa4042137486534104.
convert accbotsend
Merge branch 'master' into pdo-db

Conflicts:
	includes/accbotSend.php
	includes/database.php
fix
trigger warnings on all DB query usages
Change error message
database config
Merge branch 'pdo-db' of github.com:stwalkerster/waca into pdo-db
comments
import DataObject from github.com:dvs-inc/hotel-system (written by me)

(cherry picked from commit 970886b7532a4e223cc146dc62733cf33dab1f31)
convert clearolddata script
convert title blacklist script
Merge branch 'master' into pdo-db

Conflicts:
	includes/database.php
Resolves #34. Add ability for users to add a signature in their preferences which is automatically added to the Emails sent when closing requests (both custom and regular closes). This requires a schema change (sql/patch-emailsig.sql) to add a field for the signature. Also bootstrapify the preferences page (#30).
Fix possible XSS and use the xss() function in functions.php instead of
htmlentities in the preference stuff.
Fixes #59 and fixes #61. Apply a temporary fix for dropdown menus not
working on Mobile browsers until Bootstrap 3 is released and we upgrade
to it. Strip spaces immediately before/after the "@" symbol in Email
addresses. Also (not covered by either of the issues stated earlier)
remove the Hersfold SUL util links since its TS account is expired and
remove a parameter from "Create!" that is useless with the new creation
form on enwiki.
Better fix for the tool banning the Toolserver by default: use
getTrustedClientIP() instead of $row['pend_ip'].