Merge branch 'pull'

This commit is contained in:
Friendika 2011-06-21 23:08:30 -07:00
commit 282373de54
1 changed files with 4 additions and 4 deletions

View File

@ -367,8 +367,8 @@ function statusnet_plugin_admin_post(&$a){
$sites[] = Array( $sites[] = Array(
'sitename' => $sitename, 'sitename' => $sitename,
'apiurl' => $apiurl, 'apiurl' => $apiurl,
'secret' => $secret, 'consumersecret' => $secret,
'key' => $key 'consumerkey' => $key
); );
} }
} }
@ -386,8 +386,8 @@ function statusnet_plugin_admin(&$a, &$o){
$sitesform[] = Array( $sitesform[] = Array(
'sitename' => Array("sitename[$id]", "Site name", $s['sitename'], ""), 'sitename' => Array("sitename[$id]", "Site name", $s['sitename'], ""),
'apiurl' => Array("apiurl[$id]", "Api url", $s['apiurl'], ""), 'apiurl' => Array("apiurl[$id]", "Api url", $s['apiurl'], ""),
'secret' => Array("secret[$id]", "Secret", $s['secret'], ""), 'secret' => Array("secret[$id]", "Secret", $s['consumersecret'], ""),
'key' => Array("key[$id]", "Key", $s['key'], ""), 'key' => Array("key[$id]", "Key", $s['consumerkey'], ""),
'delete' => Array("delete[$id]", "Delete", False , "Check to delete this preset"), 'delete' => Array("delete[$id]", "Delete", False , "Check to delete this preset"),
); );
} }