diff options
| author | marijus <mario@mariovavti.com> | 2014-08-23 07:59:12 +0200 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2014-08-23 07:59:12 +0200 |
| commit | 8d382a9394a1b3b32fcd40553add9520e076ab68 (patch) | |
| tree | 409292976fe0b3ea818a3f807835883056a09199 /mod/import.php | |
| parent | b0d52943e85bf819d4ddf91127ca25ec7a32c289 (diff) | |
| parent | 9196c9eef091e7f4a41fbc9452521d6ca2de55a3 (diff) | |
| download | volse-hubzilla-8d382a9394a1b3b32fcd40553add9520e076ab68.tar.gz volse-hubzilla-8d382a9394a1b3b32fcd40553add9520e076ab68.tar.bz2 volse-hubzilla-8d382a9394a1b3b32fcd40553add9520e076ab68.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'mod/import.php')
| -rw-r--r-- | mod/import.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mod/import.php b/mod/import.php index d3b237c3a..e732c3c06 100644 --- a/mod/import.php +++ b/mod/import.php @@ -179,13 +179,14 @@ function import_post(&$a) { // create new hubloc for the new channel at this site - $r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_addr, hubloc_flags, + $r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_addr, hubloc_network, hubloc_flags, hubloc_url, hubloc_url_sig, hubloc_host, hubloc_callback, hubloc_sitekey ) - values ( '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s' )", + values ( '%s', '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s' )", dbesc($channel['channel_guid']), dbesc($channel['channel_guid_sig']), dbesc($channel['channel_hash']), dbesc($channel['channel_address'] . '@' . get_app()->get_hostname()), + dbesc('zot'), intval(($seize) ? HUBLOC_FLAGS_PRIMARY : 0), dbesc(z_root()), dbesc(base64url_encode(rsa_sign(z_root(),$channel['channel_prvkey']))), |