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

2 files changed, 12 insertions, 2 deletions

diff --git a/CHANGELOG b/CHANGELOG
index b90ae34c9..23c1be7d5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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)
 	- Port cdav calendar to fullcalendar version 4
 	- Fix perms_pending not evaluated correctly
diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php
index 30670c329..0dc6d0194 100644
--- a/Zotlabs/Module/Photo.php
+++ b/Zotlabs/Module/Photo.php
@@ -173,8 +173,7 @@ class Photo extends \Zotlabs\Web\Controller {
 								// SSLify if needed
 								if(strpos(z_root(),'https:') !== false && strpos($url,'https:') === false)
 									$url = z_root() . '/sslify/' . $filename . '?f=&url=' . urlencode($url);
-								header("Location: " . $url);
-								killme();
+								goaway($url);
 							}
 						}
 					}