summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-02-11 16:42:58 -0500
committerEvan Prodromou <evan@status.net>2010-02-11 16:42:58 -0500
commita6ab9c4a3e820b9d293075b1fec8b5eb05df87e9 (patch)
tree8145da2b4c75ad9c3f43caf139a4734ebea6e7ce
parent1773d12a24d2720cdb6c1b517999cac1f708b355 (diff)
Themes can be served from an SSL server
-rw-r--r--lib/default.php3
-rw-r--r--lib/theme.php4
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/default.php b/lib/default.php
index bf4b83718..1a2cc4cf6 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -123,7 +123,8 @@ $default =
'theme' =>
array('server' => null,
'dir' => null,
- 'path'=> null),
+ 'path'=> null,
+ 'ssl' => false),
'javascript' =>
array('server' => null,
'path'=> null),
diff --git a/lib/theme.php b/lib/theme.php
index 020ce1ac4..bed631d9c 100644
--- a/lib/theme.php
+++ b/lib/theme.php
@@ -110,9 +110,9 @@ class Theme
$server = common_config('site', 'server');
}
- // XXX: protocol
+ $protocol = common_config('theme', 'ssl') ? 'https' : 'http';
- $this->path = 'http://'.$server.$path.$name;
+ $this->path = $protocol . '://'.$server.$path.$name;
}
}