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

ability to pre-populate connections for new channels. e.g. "MySpace Tom"

Browse Source
This commit is contained in:
friendica 2014-10-01 14:48:08 -07:00
parent f19d718631
commit 467c6c72f0
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/follow.php
View File

@ -84,7 +84,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
// Premium channel, set confirm before callback to avoid recursion
if(array_key_exists('connect_url',$j) && (! $confirm))
if(array_key_exists('connect_url',$j) && ($interactive) && (! $confirm))
goaway(zid($j['connect_url']));

11
include/identity.php
View File

@ -166,7 +166,7 @@ function create_identity($arr) {
$ret['message'] = t('No account identifier');
return $ret;
}
$ret=identity_check_service_class($arr['account_id']);
$ret = identity_check_service_class($arr['account_id']);
if (!$ret['success']) {
return $ret;
}
@ -389,6 +389,15 @@ function create_identity($arr) {
}
}
$accts = get_config('system','auto_follow');
if($accts) {
if(! is_array($accts))
$accts = array($accts);
foreach($accts as $acct) {
if(trim($acct))
new_contact($newuid,trim($acct),$ret['channel'],false);
}
}
call_hooks('register_account', $newuid);

2
include/zot.php
View File

@ -1674,8 +1674,6 @@ function process_location_delivery($sender,$arr,$deliveries) {
logger('process_location_delivery: results: ' . print_r($x,true), LOGGER_DATA);
}
// We need to merge this code with that in the import_xchan function so as to make it
// easier to maintain changes.
function sync_locations($sender,$arr,$absolute = false) {

2
version.inc
View File

@ -1 +1 @@
2014-09-30.814
2014-10-01.815