From e587631eeb7d05ebec563e57a1f665fcd911b69b Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 19 Feb 2013 08:28:10 +0100 Subject: [PATCH] look for the application name in pconfig 1st, then global config --- statusnet/statusnet.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 393bbfe5..d12aefe7 100755 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -791,8 +791,12 @@ function statusnet_fetchtimeline($a, $uid) { $osecret = get_pconfig($uid, 'statusnet', 'oauthsecret'); $lastid = get_pconfig($uid, 'statusnet', 'lastid'); - $application_name = get_config('statusnet', 'application_name'); - + // get the application name for the SN app + // 1st try personal config, then system config and fallback to the + // hostname of the node if neither one is set. + $application_name = get_pconfig( $uid, 'statusnet', 'application_name'); + if ($application_name == "") + $application_name = get_config('statusnet', 'application_name'); if ($application_name == "") $application_name = $a->get_hostname();