strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

ping.php performance: fix formatting

Browse source
This commit is contained in:
Hypolite Petovan 2016-10-28 12:29:55 -04:00
parent 9e127abbae
commit cc4363c5c6
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
boot.php
View file

@ -793,21 +793,22 @@ class App {
// Is the function called statically? // Is the function called statically?
if (!is_object($this)) { if (!is_object($this)) {
return(self::$a->get_baseurl($ssl)); return self::$a->get_baseurl($ssl);
} }
if (!isset($this->baseurl[$ssl ? 'https' : 'http'])) { if (!isset($this->baseurl[$ssl ? 'https' : 'http'])) {
$scheme = $this->scheme; $scheme = $this->scheme;
if((x($this->config, 'system')) && (x($this->config['system'], 'ssl_policy'))) { if ((x($this->config, 'system')) && (x($this->config['system'], 'ssl_policy'))) {
if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL)) if (intval($this->config['system']['ssl_policy']) === SSL_POLICY_FULL) {
$scheme = 'https'; $scheme = 'https';
}
// Basically, we have $ssl = true on any links which can only be seen by a logged in user // Basically, we have $ssl = true on any links which can only be seen by a logged in user
// (and also the login link). Anything seen by an outsider will have it turned off. // (and also the login link). Anything seen by an outsider will have it turned off.
if($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) { if ($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
if($ssl) { if ($ssl) {
$scheme = 'https'; $scheme = 'https';
} else { } else {
$scheme = 'http'; $scheme = 'http';
@ -815,7 +816,7 @@ class App {
} }
} }
if (get_config('config','hostname') != '') { if (get_config('config', 'hostname') != '') {
$this->hostname = get_config('config', 'hostname'); $this->hostname = get_config('config', 'hostname');
} }