diff options
| author | friendica <info@friendica.com> | 2012-07-11 16:54:18 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-07-11 16:54:18 -0700 |
| commit | 3f414aec63257f7e9e6aa19671502794f9c1d524 (patch) | |
| tree | a4be655071e84b81b3674c3bb9acddfe5306d89a /mod | |
| parent | 71afdf3d9c8cce686f0b996f4ab08e480edfc5d0 (diff) | |
| download | volse-hubzilla-3f414aec63257f7e9e6aa19671502794f9c1d524.tar.gz volse-hubzilla-3f414aec63257f7e9e6aa19671502794f9c1d524.tar.bz2 volse-hubzilla-3f414aec63257f7e9e6aa19671502794f9c1d524.zip | |
get rid of special "short salmon key" for statusnet
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/modexp.php | 4 | ||||
| -rw-r--r-- | mod/xrd.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mod/modexp.php b/mod/modexp.php index bba2c2882..a869fc1f9 100644 --- a/mod/modexp.php +++ b/mod/modexp.php @@ -8,14 +8,14 @@ function modexp_init(&$a) { killme(); $nick = $a->argv[1]; - $r = q("SELECT `spubkey` FROM `user` WHERE `nickname` = '%s' LIMIT 1", + $r = q("SELECT `pubkey` FROM `user` WHERE `nickname` = '%s' LIMIT 1", dbesc($nick) ); if(! count($r)) killme(); - $lines = explode("\n",$r[0]['spubkey']); + $lines = explode("\n",$r[0]['pubkey']); unset($lines[0]); unset($lines[count($lines)]); $x = base64_decode(implode('',$lines)); diff --git a/mod/xrd.php b/mod/xrd.php index 2fa6bcd99..623c34b4e 100644 --- a/mod/xrd.php +++ b/mod/xrd.php @@ -22,7 +22,7 @@ function xrd_init(&$a) { if(! count($r)) killme(); - $salmon_key = salmon_key($r[0]['spubkey']); + $salmon_key = salmon_key($r[0]['pubkey']); header('Access-Control-Allow-Origin: *'); header("Content-type: text/xml"); |