diff options
| author | habeascodice <habeascodice@federated.social> | 2014-11-13 13:30:29 -0800 |
|---|---|---|
| committer | habeascodice <habeascodice@federated.social> | 2014-11-13 13:30:29 -0800 |
| commit | 2dbecf95454993cdf4996d2d65463d7759cd479b (patch) | |
| tree | cbef39a4779efed1c0ab3b61a9ff09e37fadb49e /mod/import.php | |
| parent | bc02b933727da7a000d43d2d7d495f066616dc81 (diff) | |
| parent | ac27db22c18ee7a82a52cbadb3efe2760b910499 (diff) | |
| download | volse-hubzilla-2dbecf95454993cdf4996d2d65463d7759cd479b.tar.gz volse-hubzilla-2dbecf95454993cdf4996d2d65463d7759cd479b.tar.bz2 volse-hubzilla-2dbecf95454993cdf4996d2d65463d7759cd479b.zip | |
Merge branch 'master' of https://github.com/habeascodice/red
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]), |