bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Hypolite Petovan 2019-06-23 17:40:52 -04:00
commit b9ab613777
164 changed files with 30233 additions and 26266 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/App.php
View file

@ -993,12 +993,6 @@ class App
);
}
if (strstr($this->query_string, '.well-known/host-meta') && ($this->query_string != '.well-known/host-meta')) {
Module\Special\HTTPException::rawContent(
new HTTPException\NotFoundException()
);
}
if (!$this->getMode()->isInstall()) {
// Force SSL redirection
if ($this->baseURL->checkRedirectHttps()) {
@ -1105,7 +1099,7 @@ class App
// Compatibility with the Android Diaspora client
if ($this->module == 'stream') {
$this->internalRedirect('network?f=&order=post');
$this->internalRedirect('network?order=post');
}
if ($this->module == 'conversations') {
@ -1113,15 +1107,15 @@ class App
}
if ($this->module == 'commented') {
$this->internalRedirect('network?f=&order=comment');
$this->internalRedirect('network?order=comment');
}
if ($this->module == 'liked') {
$this->internalRedirect('network?f=&order=comment');
$this->internalRedirect('network?order=comment');
}
if ($this->module == 'activity') {
$this->internalRedirect('network/?f=&conv=1');
$this->internalRedirect('network?conv=1');
}
if (($this->module == 'status_messages') && ($this->cmd == 'status_messages/new')) {