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

Merge branch 'dev' of https://framagit.org/hubzilla/core into dev

Browse Source
This commit is contained in:
zotlabs 2019-04-27 17:21:42 -07:00
commit 55ce80aabe
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CHANGELOG
View File

@ -1,3 +1,14 @@
Hubzilla 4.0.3 (2019-04-26)
- Add attachments to zot6 event objects
- Add zot6 to federated transports
- Update import/export to handle zot6 hublocs and xchans
- Update fix_system_urls() to handle zot6 hublocs
- Fix infinite loop using postgres as backend
- Fix magic auth in combination with zot6
- Fix check for required PHP version
- Diaspora: favour diaspora protocol identities over others with same hubloc or xchan address
Hubzilla 4.0.2 (2019-04-08) Hubzilla 4.0.2 (2019-04-08)
- Port cdav calendar to fullcalendar version 4 - Port cdav calendar to fullcalendar version 4
- Fix perms_pending not evaluated correctly - Fix perms_pending not evaluated correctly

3
Zotlabs/Module/Photo.php
View File

@ -173,8 +173,7 @@ class Photo extends \Zotlabs\Web\Controller {
// SSLify if needed // SSLify if needed
if(strpos(z_root(),'https:') !== false && strpos($url,'https:') === false) if(strpos(z_root(),'https:') !== false && strpos($url,'https:') === false)
$url = z_root() . '/sslify/' . $filename . '?f=&url=' . urlencode($url); $url = z_root() . '/sslify/' . $filename . '?f=&url=' . urlencode($url);
header("Location: " . $url); goaway($url);
killme();
} }
} }
} }