diff options
author | redmatrix <redmatrix@redmatrix.me> | 2015-06-09 16:52:00 -0700 |
---|---|---|
committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-09 16:52:00 -0700 |
commit | 03357481f73d506ae36be9858dc757842408c6a9 (patch) | |
tree | a69772d6caf71f4986a26eb80d00ac4e8750b995 /mod/magic.php | |
parent | ec1dcb8f2eccfd1a0dfc9c7eccea788a4b385e41 (diff) | |
parent | 805e2a28ee81febee2742587a1640b5fae1387a2 (diff) | |
download | volse-hubzilla-03357481f73d506ae36be9858dc757842408c6a9.tar.gz volse-hubzilla-03357481f73d506ae36be9858dc757842408c6a9.tar.bz2 volse-hubzilla-03357481f73d506ae36be9858dc757842408c6a9.zip |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
install/schema_mysql.sql
mod/home.php
mod/page.php
view/nl/messages.po
view/nl/strings.php
Diffstat (limited to 'mod/magic.php')
-rw-r--r-- | mod/magic.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mod/magic.php b/mod/magic.php index df8ac39a8..2fee87241 100644 --- a/mod/magic.php +++ b/mod/magic.php @@ -133,7 +133,6 @@ function magic_init(&$a) { $channel['token'] = $token; $channel['token_sig'] = $token_sig; - $r = q("insert into verify ( type, channel, token, meta, created) values ('%s','%d','%s','%s','%s')", dbesc('auth'), intval($channel['channel_id']), @@ -141,7 +140,6 @@ function magic_init(&$a) { dbesc($x[0]['hubloc_url']), dbesc(datetime_convert()) ); - $target_url = $x[0]['hubloc_callback'] . '/?f=&auth=' . urlencode($channel['channel_address'] . '@' . $a->get_hostname()) . '&sec=' . $token . '&dest=' . urlencode($dest) . '&version=' . ZOT_REVISION; |