diff options
| author | zotlabs <mike@macgirvin.com> | 2016-10-23 17:49:15 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-10-23 17:49:15 -0700 |
| commit | 8d52a278a964de86f2159441ed0cffe3add0d916 (patch) | |
| tree | 5037abae57c01c7ff9f53e760314bb552d2b7773 /include/import.php | |
| parent | d30892ea601e9131c6dc3b25aeee1f258f72a104 (diff) | |
| parent | 5fbba27d17c78081e784fc2f8e9bb1907b79b4b7 (diff) | |
| download | volse-hubzilla-8d52a278a964de86f2159441ed0cffe3add0d916.tar.gz volse-hubzilla-8d52a278a964de86f2159441ed0cffe3add0d916.tar.bz2 volse-hubzilla-8d52a278a964de86f2159441ed0cffe3add0d916.zip | |
Merge branch 'dev' into pdo
Diffstat (limited to 'include/import.php')
| -rw-r--r-- | include/import.php | 2 |
1 files changed, 1 insertions, 1 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']) ); |