harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get rid of ssl_policy - it's implicit in the site url

Browse Source
This commit is contained in:
friendica
2013-08-27 02:27:36 -07:00
parent 31b934eb5e
commit 6a2cb837af
5 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
boot.php
View File

@@ -768,11 +768,11 @@ class App {
$scheme = $this->scheme;
if((x($this->config,'system')) && (x($this->config['system'],'ssl_policy'))) {
if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL)) {
$scheme = 'https';
}
}
// if((x($this->config,'system')) && (x($this->config['system'],'ssl_policy'))) {
// if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL)) {
// $scheme = 'https';
// }
// }
$this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
return $this->baseurl;