summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-10-31 14:36:04 -0400
committerEvan Prodromou <evan@status.net>2009-10-31 14:36:04 -0400
commit4e9ec0d0e1aeb43b432f4692b4819beb9408ad3b (patch)
treeb40cc8f0b4a621a37059c6416da40372a50d8f99 /lib
parent24c3a15124ab866bf7e9401f638156e102074608 (diff)
parentc637fe8cf07c22534e5227082ba81a12a8da3075 (diff)
merge from testing
Diffstat (limited to 'lib')
-rw-r--r--lib/util.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/util.php b/lib/util.php
index b6e89f0bd..d159c583e 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -781,12 +781,18 @@ function common_path($relative, $ssl=false)
if (is_string(common_config('site', 'sslserver')) &&
mb_strlen(common_config('site', 'sslserver')) > 0) {
$serverpart = common_config('site', 'sslserver');
- } else {
+ } else if (common_config('site', 'server')) {
$serverpart = common_config('site', 'server');
+ } else {
+ common_log(LOG_ERR, 'Site Sever not configured, unable to determine site name.');
}
} else {
$proto = 'http';
- $serverpart = common_config('site', 'server');
+ if (common_config('site', 'server')) {
+ $serverpart = common_config('site', 'server');
+ } else {
+ common_log(LOG_ERR, 'Site Sever not configured, unable to determine site name.');
+ }
}
return $proto.'://'.$serverpart.'/'.$pathpart.$relative;