summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-01-10 00:20:08 -0800
committerEvan Prodromou <evan@status.net>2010-01-10 00:20:08 -0800
commite2dee5fedbedef69fbc825fcac39973f91f09c1a (patch)
treef2949f745c2651cee6329272a8e142f7ba4779bb
parent06ed0bc7913e6af0a4aaab93459148c690be70f1 (diff)
always set site/server to hostname if it exists
-rw-r--r--classes/Status_network.php6
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;