diff options
| author | root <root@ip-10-250-162-129.ec2.internal> | 2010-01-10 08:20:29 +0000 |
|---|---|---|
| committer | root <root@ip-10-250-162-129.ec2.internal> | 2010-01-10 08:20:29 +0000 |
| commit | ef0e0116c200cc805522239794c1fbf279e204e6 (patch) | |
| tree | f2949f745c2651cee6329272a8e142f7ba4779bb /classes | |
| parent | d636bee4c01bd393a2b210fb3dd2761d4b76888d (diff) | |
| parent | e2dee5fedbedef69fbc825fcac39973f91f09c1a (diff) | |
Merge branch 'redironlogin' of http://git.gitorious.org/~evan/statusnet/evans-mainline into redironlogin
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/Status_network.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/classes/Status_network.php b/classes/Status_network.php index 1f0e602cf..776f6abb0 100644 --- a/classes/Status_network.php +++ b/classes/Status_network.php @@ -170,7 +170,11 @@ class Status_network extends DB_DataObject $config['db']['database'] = "mysqli://$dbuser:$dbpass@$dbhost/$dbname"; - $config['site']['name'] = $sn->sitename; + $config['site']['name'] = $sn->sitename; + + if (!empty($sn->hostname)) { + $config['site']['server'] = $sn->hostname; + } if (!empty($sn->theme)) { $config['site']['theme'] = $sn->theme; |