summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-01-09 22:48:05 -0800
committerEvan Prodromou <evan@status.net>2010-01-09 22:48:05 -0800
commite8d85a1ef5966ba89ea88a6d706a066986e1dceb (patch)
tree06f26ac5afb2d4da9c78f6557a65df24207016d8 /classes
parentdeb5ee61542d01d90c0b0a462d5be2fdf5b876bb (diff)
use nickname, not sitename, in domain for SSL
Diffstat (limited to 'classes')
-rw-r--r--classes/Status_network.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/Status_network.php b/classes/Status_network.php
index dce3e0b8f..96212c465 100644
--- a/classes/Status_network.php
+++ b/classes/Status_network.php
@@ -158,8 +158,8 @@ class Status_network extends DB_DataObject
0 != strcasecmp($sn->hostname, $servername)) {
$sn->redirectTo('http://'.$sn->hostname.$_SERVER['REQUEST_URI']);
} else if (!empty($_SERVER['HTTPS']) &&
- 0 != strcasecmp($sn->sitename.'.'.$wildcard, $servername)) {
- $sn->redirectTo('https://'.$sn->sitename.'.'.$wildcard.$_SERVER['REQUEST_URI']);
+ 0 != strcasecmp($sn->nickname.'.'.$wildcard, $servername)) {
+ $sn->redirectTo('https://'.$sn->nickname.'.'.$wildcard.$_SERVER['REQUEST_URI']);
}
$dbhost = (empty($sn->dbhost)) ? 'localhost' : $sn->dbhost;