diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-08-19 19:40:18 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-08-19 19:40:18 +0200 |
| commit | e50e68719155c7d35e30bb203a403854f789d5a1 (patch) | |
| tree | a10630cec177c6629fb0da38d96deb7258062698 /mod/import.php | |
| parent | 07cd0c870f48ec838c23fa7c6966ceb1c41f06ab (diff) | |
| parent | 4e3d295c909405da61d7ccd6c7bd99bd35c9feec (diff) | |
| download | volse-hubzilla-e50e68719155c7d35e30bb203a403854f789d5a1.tar.gz volse-hubzilla-e50e68719155c7d35e30bb203a403854f789d5a1.tar.bz2 volse-hubzilla-e50e68719155c7d35e30bb203a403854f789d5a1.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/import.php')
| -rw-r--r-- | mod/import.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mod/import.php b/mod/import.php index 92de33059..deee0c6e7 100644 --- a/mod/import.php +++ b/mod/import.php @@ -437,7 +437,6 @@ function import_post(&$a) { // FIXME - ensure we have an xchan if somebody is trying to pull a fast one - if($completed < 8) { $friends = 0; $feeds = 0; @@ -446,10 +445,6 @@ function import_post(&$a) { $abooks = $data['abook']; if($abooks) { foreach($abooks as $abook) { - if($max_friends !== false && $friends > $max_friends) - continue; - if($max_feeds !== false && intval($abook['abook_feed']) && ($feeds > $max_feeds)) - continue; unset($abook['abook_id']); unset($abook['abook_rating']); @@ -475,6 +470,12 @@ function import_post(&$a) { ); } } + else { + if($max_friends !== false && $friends > $max_friends) + continue; + if($max_feeds !== false && intval($abook['abook_feed']) && ($feeds > $max_feeds)) + continue; + } dbesc_array($abook); $r = dbq("INSERT INTO abook (`" |