Merge pull request #143 from kenrestivo/allow-importing-by-proxy
Bust out import_account() into a separate function
This commit is contained in:
commit
bc7c0ed844
@ -9,11 +9,12 @@ require_once('include/identity.php');
|
|||||||
require_once('include/import.php');
|
require_once('include/import.php');
|
||||||
|
|
||||||
|
|
||||||
function import_post(&$a) {
|
function import_account(&$a, $account_id) {
|
||||||
|
|
||||||
$account_id = get_account_id();
|
if(! $account_id){
|
||||||
if(! $account_id)
|
logger("import_account: No account ID supplied");
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
$max_identities = account_service_class_fetch($account_id,'total_identities');
|
$max_identities = account_service_class_fetch($account_id,'total_identities');
|
||||||
$max_friends = account_service_class_fetch($account_id,'total_channels');
|
$max_friends = account_service_class_fetch($account_id,'total_channels');
|
||||||
@ -493,6 +494,15 @@ function import_post(&$a) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function import_post(&$a) {
|
||||||
|
|
||||||
|
$account_id = get_account_id();
|
||||||
|
if(! $account_id)
|
||||||
|
return;
|
||||||
|
|
||||||
|
import_account($a, $account_id);
|
||||||
|
}
|
||||||
|
|
||||||
function import_content(&$a) {
|
function import_content(&$a) {
|
||||||
|
|
||||||
if(! get_account_id()) {
|
if(! get_account_id()) {
|
||||||
|
Reference in New Issue
Block a user