Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-10 07:42:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5575 from annando/issue-5541

Browse source 
5541: Don't do magic things when the remote site doesn't support it
This commit is contained in:
Tobias Diekershoff 2018-08-07 06:44:10 +02:00 committed by GitHub
commit 82cef6c9e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
index.php
View file

@ -107,7 +107,7 @@ if (x($_SESSION, 'language') && ($_SESSION['language'] !== $lang)) {
L10n::loadTranslationTable($lang);
}
if ((x($_GET,'zrl')) && $a->mode == App::MODE_NORMAL) {
if (!empty($_GET['zrl']) && $a->mode == App::MODE_NORMAL) {
$a->query_string = Profile::stripZrls($a->query_string);
if (!local_user()) {
// Only continue when the given profile link seems valid

6
src/Model/Profile.php
View file

@ -1050,7 +1050,11 @@ class Profile
$basepath = $urlarr[0];
if ($basepath != System::baseUrl() && !strstr($dest, '/magic') && !strstr($dest, '/rmagic')) {
goaway($basepath . '/magic' . '?f=&owa=1&dest=' . $dest);
$magic_path = $basepath . '/magic' . '?f=&owa=1&dest=' . $dest;
$serverret = Network::curl($magic_path);
if (!empty($serverret['success'])) {
goaway($magic_path);
}
}
}
}