clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6989 from nupplaphil/task/basePath_baseUrl_fix

Browse Source 
Automatic BaseURL determination fix
This commit is contained in:
Hypolite Petovan
2019-04-11 04:07:20 -04:00
committed by GitHub
parent a65a30b303 dc48690ed5
commit 6a2c0b3cc7
23 changed files with 1020 additions and 905 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Protocol/DFRN.php
+4 -3
View File
@@ -29,6 +29,7 @@ use Friendica\Model\PermissionSet;
use Friendica\Model\Profile;
use Friendica\Model\User;
use Friendica\Object\Image;
use Friendica\Util\BaseURL;
use Friendica\Util\Crypto;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
@@ -1208,13 +1209,13 @@ class DFRN
$ssl_val = intval(Config::get('system', 'ssl_policy'));
switch ($ssl_val) {
case SSL_POLICY_FULL:
case BaseURL::SSL_POLICY_FULL:
$ssl_policy = 'full';
break;
case SSL_POLICY_SELFSIGN:
case BaseURL::SSL_POLICY_SELFSIGN:
$ssl_policy = 'self';
break;
case SSL_POLICY_NONE:
case BaseURL::SSL_POLICY_NONE:
default:
$ssl_policy = 'none';
break;