aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-10-21 21:44:15 -0700
committerzotlabs <mike@macgirvin.com>2016-10-21 21:44:15 -0700
commitc5dcac4dbb9348da8b11bb99e4d9b5a50e16fad9 (patch)
tree6433dee7783e9a3a3e8221d77369300ee2115566
parentaa9fef7778ab0b829d09493436e463b94af79ee6 (diff)
downloadvolse-hubzilla-c5dcac4dbb9348da8b11bb99e4d9b5a50e16fad9.tar.gz
volse-hubzilla-c5dcac4dbb9348da8b11bb99e4d9b5a50e16fad9.tar.bz2
volse-hubzilla-c5dcac4dbb9348da8b11bb99e4d9b5a50e16fad9.zip
issue #564
-rw-r--r--include/import.php2
-rw-r--r--include/message.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/import.php b/include/import.php
index d5f6e5c8a..49cdb2574 100644
--- a/include/import.php
+++ b/include/import.php
@@ -860,7 +860,7 @@ function import_conv($channel,$convs) {
if($channel && $convs) {
foreach($convs as $conv) {
if($conv['deleted']) {
- q("delete from conv where guid = '%s' and uid = %d limit 1",
+ q("delete from conv where guid = '%s' and uid = %d",
dbesc($conv['guid']),
intval($channel['channel_id'])
);
diff --git a/include/message.php b/include/message.php
index 25986092d..f5821490d 100644
--- a/include/message.php
+++ b/include/message.php
@@ -436,7 +436,7 @@ function private_messages_drop($channel_id, $messageitem_id, $drop_conversation
intval($channel_id)
);
if($z) {
- q("delete from conv where guid = '%s' and uid = %d limit 1",
+ q("delete from conv where guid = '%s' and uid = %d",
dbesc($x[0]['conv_guid']),
intval($channel_id)
);