harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '3.4RC'

Browse Source
This commit is contained in:
Mario Vavti
2018-05-04 09:46:27 +02:00
parent f15c12376a be852ba857
commit be4c9a9598
1045 changed files with 50260 additions and 31740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/import.php
View File

@@ -21,6 +21,11 @@ function import_channel($channel, $account_id, $seize) {
$channel['channel_removed'] = (($channel['channel_pageflags'] & 0x8000) ? 1 : 0);
}
if(intval($channel['channel_removed'])) {
notice( t('Unable to import a removed channel.') . EOL);
return false;
}
// Ignore the hash provided and re-calculate
$channel['channel_hash'] = make_xchan_hash($channel['channel_guid'],$channel['channel_guid_sig']);
@@ -94,7 +99,7 @@ function import_channel($channel, $account_id, $seize) {
}
if($clean) {
create_table_from_array('channel',$clean);
channel_store_lowlevel($clean);
}
$r = q("select * from channel where channel_account_id = %d and channel_guid = '%s' limit 1",
@@ -176,7 +181,7 @@ function import_profiles($channel, $profiles) {
$profile['thumb'] = z_root() . '/photo/' . basename($profile['thumb']);
}
create_table_from_array('profile', $profile);
profile_store_lowlevel($profile);
}
}
}