aboutsummaryrefslogtreecommitdiffstats
path: root/library/spam
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2014-06-24 19:34:36 +0200
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2014-06-24 19:34:36 +0200
commitb8dc9e855af2d30f33d0f90dc13d8cad0a7b3e70 (patch)
tree718df6305bcb82c8dcb4b287a7132422e748cdfb /library/spam
parentc2d520f1be115fb3cb5da2a35eb10146cecee8aa (diff)
parenta92fb0b04c3e6474ec48faf8e4cc65c382e89d66 (diff)
downloadvolse-hubzilla-b8dc9e855af2d30f33d0f90dc13d8cad0a7b3e70.tar.gz
volse-hubzilla-b8dc9e855af2d30f33d0f90dc13d8cad0a7b3e70.tar.bz2
volse-hubzilla-b8dc9e855af2d30f33d0f90dc13d8cad0a7b3e70.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'library/spam')
-rw-r--r--library/spam/b8/storage/storage_frndc.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/library/spam/b8/storage/storage_frndc.php b/library/spam/b8/storage/storage_frndc.php
index 62909d471..f211d4431 100644
--- a/library/spam/b8/storage/storage_frndc.php
+++ b/library/spam/b8/storage/storage_frndc.php
@@ -205,7 +205,7 @@ class b8_storage_frndc extends b8_storage_base
foreach($to_create as $term) {
if(strlen($sql))
$sql .= ',';
- $sql .= sprintf("(term,datetime,uid) values('%s','%s',%d)",
+ $sql .= sprintf("(term,date,uid) values('%s','%s',%d)",
dbesc(str_tolower($term))
dbesc(datetime_convert()),
intval($uid)
@@ -280,16 +280,16 @@ class b8_storage_frndc extends b8_storage_base
$result = q('
DELETE FROM ' . $this->config['table_name'] . '
- WHERE token IN ("' . implode('", "', $this->_deletes) . '") AND uid = ' . $this->uid);
+ WHERE term IN ("' . implode('", "', $this->_deletes) . '") AND uid = ' . $this->uid);
$this->_deletes = array();
}
if(count($this->_puts) > 0) {
-
+//fixme
$result = q('
- INSERT INTO ' . $this->config['table_name'] . '(token, count, uid)
+ INSERT INTO ' . $this->config['table_name'] . '(term, count, uid)
VALUES ' . implode(', ', $this->_puts));
$this->_puts = array();