Merge branch 'develop' into refresh

Conflicts:
	plugins/regex_chans.py
This commit is contained in:
Luke Rogers 2014-02-15 18:34:37 +13:00
commit cdc9102694
9 changed files with 108 additions and 34 deletions

View file

@ -7,6 +7,8 @@ from util import hook, http, text, pyexec
re_lineends = re.compile(r'[\r\n]*')
db_ready = False
# some simple "shortcodes" for formatting purposes
shortcodes = {
'[b]': '\x02',
@ -18,9 +20,12 @@ shortcodes = {
def db_init(db):
db.execute("create table if not exists mem(word, data, nick,"
" primary key(word))")
db.commit()
global db_ready
if not db_ready:
db.execute("create table if not exists mem(word, data, nick,"
" primary key(word))")
db.commit()
db_ready = True
def get_memory(db, word):