From e2dee5fedbedef69fbc825fcac39973f91f09c1a Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 10 Jan 2010 00:20:08 -0800
Subject: always set site/server to hostname if it exists

---
 classes/Status_network.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'classes/Status_network.php')

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;
-- 
cgit v1.2.3-54-g00ecf