aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-06-21 23:08:30 -0700
committerFriendika <info@friendika.com>2011-06-21 23:08:30 -0700
commit282373de542ecb58293cc4b100e003dd0ccad687 (patch)
tree2ecbe9d796576073aa7215f598ae264be5d0cd1e
parent3da55206ca884b27b984a167f415cfe298fa072a (diff)
parent6056a6314be73289536ad573c8b0702801dec8e5 (diff)
downloadvolse-hubzilla-282373de542ecb58293cc4b100e003dd0ccad687.tar.gz
volse-hubzilla-282373de542ecb58293cc4b100e003dd0ccad687.tar.bz2
volse-hubzilla-282373de542ecb58293cc4b100e003dd0ccad687.zip
Merge branch 'pull'
-rw-r--r--addon/statusnet/statusnet.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/addon/statusnet/statusnet.php b/addon/statusnet/statusnet.php
index cb0f87764..85024631c 100644
--- a/addon/statusnet/statusnet.php
+++ b/addon/statusnet/statusnet.php
@@ -367,8 +367,8 @@ function statusnet_plugin_admin_post(&$a){
$sites[] = Array(
'sitename' => $sitename,
'apiurl' => $apiurl,
- 'secret' => $secret,
- 'key' => $key
+ 'consumersecret' => $secret,
+ 'consumerkey' => $key
);
}
}
@@ -386,8 +386,8 @@ function statusnet_plugin_admin(&$a, &$o){
$sitesform[] = Array(
'sitename' => Array("sitename[$id]", "Site name", $s['sitename'], ""),
'apiurl' => Array("apiurl[$id]", "Api url", $s['apiurl'], ""),
- 'secret' => Array("secret[$id]", "Secret", $s['secret'], ""),
- 'key' => Array("key[$id]", "Key", $s['key'], ""),
+ 'secret' => Array("secret[$id]", "Secret", $s['consumersecret'], ""),
+ 'key' => Array("key[$id]", "Key", $s['consumerkey'], ""),
'delete' => Array("delete[$id]", "Delete", False , "Check to delete this preset"),
);
}