diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-04-03 21:36:29 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-04-03 21:36:29 -0400 |
| commit | 0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f (patch) | |
| tree | a92197de4503ec52889dc05483493f4df1a305b8 /mod/import.php | |
| parent | 99d9456b3addc651a68874ddd391d25684252c4d (diff) | |
| parent | b4c1baada1fba46d4d75f40a7e78111d70d54e7a (diff) | |
| download | volse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.tar.gz volse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.tar.bz2 volse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.zip | |
Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextual-help
Diffstat (limited to 'mod/import.php')
| -rw-r--r-- | mod/import.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mod/import.php b/mod/import.php index f91f261a5..e0c2ffa82 100644 --- a/mod/import.php +++ b/mod/import.php @@ -149,7 +149,7 @@ function import_account(&$a, $account_id) { } if(! $channel) - $channel = $a->get_channel(); + $channel = App::get_channel(); if(! $channel) { logger('mod_import: channel not found. ', print_r($channel,true)); @@ -205,12 +205,12 @@ function import_account(&$a, $account_id) { dbesc($channel['channel_guid']), dbesc($channel['channel_guid_sig']), dbesc($channel['channel_hash']), - dbesc($channel['channel_address'] . '@' . get_app()->get_hostname()), + dbesc($channel['channel_address'] . '@' . App::get_hostname()), dbesc('zot'), intval(($seize) ? 1 : 0), dbesc(z_root()), dbesc(base64url_encode(rsa_sign(z_root(),$channel['channel_prvkey']))), - dbesc(get_app()->get_hostname()), + dbesc(App::get_hostname()), dbesc(z_root() . '/post'), dbesc(get_config('system','pubkey')) ); @@ -246,10 +246,10 @@ function import_account(&$a, $account_id) { dbesc($channel['channel_guid']), dbesc($channel['channel_guid_sig']), dbesc($channel['channel_pubkey']), - dbesc($a->get_baseurl() . "/photo/profile/l/" . $channel['channel_id']), - dbesc($a->get_baseurl() . "/photo/profile/m/" . $channel['channel_id']), - dbesc($a->get_baseurl() . "/photo/profile/s/" . $channel['channel_id']), - dbesc($channel['channel_address'] . '@' . get_app()->get_hostname()), + dbesc(z_root() . "/photo/profile/l/" . $channel['channel_id']), + dbesc(z_root() . "/photo/profile/m/" . $channel['channel_id']), + dbesc(z_root() . "/photo/profile/s/" . $channel['channel_id']), + dbesc($channel['channel_address'] . '@' . App::get_hostname()), dbesc(z_root() . '/channel/' . $channel['channel_address']), dbesc(z_root() . '/follow?f=&url=%s'), dbesc(z_root() . '/poco/' . $channel['channel_address']), |