diff options
| author | Olivier van Helden <olivier@van-helden.net> | 2014-12-03 17:54:07 -0400 |
|---|---|---|
| committer | Olivier van Helden <olivier@van-helden.net> | 2014-12-03 17:54:07 -0400 |
| commit | e523061b7261439a71bdacf8f46d4c614740b356 (patch) | |
| tree | 1a0577c64197c4289ed154d2c2d5fdf48a7e5192 /mod/import.php | |
| parent | 13fd91d6f5723774a1b96257f8096acb2873b4ed (diff) | |
| parent | b71b45aafc618d32d23c099a4d4db8bad2f09e54 (diff) | |
| download | volse-hubzilla-e523061b7261439a71bdacf8f46d4c614740b356.tar.gz volse-hubzilla-e523061b7261439a71bdacf8f46d4c614740b356.tar.bz2 volse-hubzilla-e523061b7261439a71bdacf8f46d4c614740b356.zip | |
Merge pull request #1 from friendica/master
Merge master from friendica
Diffstat (limited to 'mod/import.php')
| -rw-r--r-- | mod/import.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mod/import.php b/mod/import.php index 44dfcc38d..6cb3767a6 100644 --- a/mod/import.php +++ b/mod/import.php @@ -215,7 +215,7 @@ function import_post(&$a) { // reset the original primary hubloc if it is being seized if($seize) - $r = q("update hubloc set hubloc_flags = (hubloc_flags ^ %d) where (hubloc_flags & %d) and hubloc_hash = '%s' and hubloc_url != '%s' ", + $r = q("update hubloc set hubloc_flags = (hubloc_flags & ~%d) where (hubloc_flags & %d)>0 and hubloc_hash = '%s' and hubloc_url != '%s' ", intval(HUBLOC_FLAGS_PRIMARY), intval(HUBLOC_FLAGS_PRIMARY), dbesc($channel['channel_hash']), @@ -228,7 +228,7 @@ function import_post(&$a) { // replace our existing xchan if we're seizing control - $r = q("delete from xchan where xchan_hash = '%s' limit 1", + $r = q("delete from xchan where xchan_hash = '%s'", dbesc($channel['channel_hash']) ); @@ -278,7 +278,7 @@ function import_post(&$a) { $photodate = $xchan['xchan_photo_date']; $r = q("update xchan set xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s', xchan_photo_date = '%s' - where xchan_hash = '%s' limit 1", + where xchan_hash = '%s'", dbesc($photos[0]), dbesc($photos[1]), dbesc($photos[2]), |