Themes can be served from an SSL server
This commit is contained in:
parent
1773d12a24
commit
a6ab9c4a3e
|
@ -123,7 +123,8 @@ $default =
|
||||||
'theme' =>
|
'theme' =>
|
||||||
array('server' => null,
|
array('server' => null,
|
||||||
'dir' => null,
|
'dir' => null,
|
||||||
'path'=> null),
|
'path'=> null,
|
||||||
|
'ssl' => false),
|
||||||
'javascript' =>
|
'javascript' =>
|
||||||
array('server' => null,
|
array('server' => null,
|
||||||
'path'=> null),
|
'path'=> null),
|
||||||
|
|
|
@ -110,9 +110,9 @@ class Theme
|
||||||
$server = common_config('site', 'server');
|
$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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user