use original exif_read_data() parameters which were lost in a regression; unset automatic nsfw category generated for Mastodon content warning posts, as people use CW as a spoiler mechanism 99% of the time and flagging inappropriate content 1% of the time.

2 files changed, 9 insertions, 1 deletions

diff --git a/include/feedutils.php b/include/feedutils.php
index 369193fce..4864a6ef5 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -668,6 +668,14 @@ function get_atom_elements($feed, $item) {
 			}
 			$termterm = notags(trim(unxmlify($term)));
 
+			// Mastodon auto generates an nsfw category tag for any 'content-warning' message.
+			// Most people use CW and use both summary/content as a spoiler and we honour that 
+			// construct so the post will already be collapsed. The generated tag is almost 
+			// always wrong and even if it isn't we would already be doing the right thing.
+	
+			if($mastodon && $termterm === 'nsfw')
+				continue;
+
 			if($termterm) {
 				$terms[] = array(
 					'otype' => TERM_OBJ_POST,
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index 00284a288..22d2b776d 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -273,7 +273,7 @@ abstract class photo_driver {
 		}
 
 		if($f) {
-			return @exif_read_data($f);
+			return @exif_read_data($f,null,true);
 		}
 
 		return false;