Procházet zdrojové kódy

Merge pull request #2601 from pixelfed/staging

Update AP helpers, fix statusFetch 404s
daniel před 4 roky
rodič
revize
ee62997168
2 změnil soubory, kde provedl 2 přidání a 1 odebrání
  1. 1 0
      CHANGELOG.md
  2. 1 1
      app/Util/ActivityPub/Helpers.php

+ 1 - 0
CHANGELOG.md

@@ -20,6 +20,7 @@
 - Updated VideoThumbnail job, generate blurhash for videos. ([896452c7](https://github.com/pixelfed/pixelfed/commit/896452c7))
 - Updated MediaTransformers, add default blurhash attribute. ([3f14a4c4](https://github.com/pixelfed/pixelfed/commit/3f14a4c4))
 - Updated Timeline.vue, fix hashtag status previews. ([7768e844](https://github.com/pixelfed/pixelfed/commit/7768e844))
+- Updated AP helpers, fix statusFetch 404s. ([3419379a](https://github.com/pixelfed/pixelfed/commit/3419379a))
 
 ## [v0.10.10 (2021-01-28)](https://github.com/pixelfed/pixelfed/compare/v0.10.9...v0.10.10)
 ### Added

+ 1 - 1
app/Util/ActivityPub/Helpers.php

@@ -258,7 +258,7 @@ class Helpers {
 
 		$res = self::fetchFromUrl($url);
 		
-		if(!$res || empty($res)) {
+		if(!$res || empty($res) || isset($res['error']) ) {
 			return;
 		}