Bläddra i källkod

Compat import JSON milliseconds (#4186)

#fix https://github.com/FreshRSS/FreshRSS/issues/4185
Alexandre Alapetite 4 år sedan
förälder
incheckning
05ca0517bb
1 ändrade filer med 9 tillägg och 6 borttagningar
  1. 9 6
      app/Controllers/importExportController.php

+ 9 - 6
app/Controllers/importExportController.php

@@ -409,16 +409,19 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController {
 			$content = sanitizeHTML($content, $url);
 
 			if (!empty($item['published'])) {
-				$published = $item['published'];
+				$published = '' . $item['published'];
 			} elseif (!empty($item['timestampUsec'])) {
-				$published = substr($item['timestampUsec'], 0, -6);
+				$published = substr('' . $item['timestampUsec'], 0, -6);
 			} elseif (!empty($item['updated'])) {
-				$published = $item['updated'];
+				$published = '' . $item['updated'];
 			} else {
-				$published = 0;
+				$published = '0';
 			}
-			if (!ctype_digit('' . $published)) {
-				$published = strtotime($published);
+			if (!ctype_digit($published)) {
+				$published = '' . strtotime($published);
+			}
+			if (strlen($published) > 10) {	// Milliseconds, e.g. Feedly
+				$published = substr($published, 0, -3);
 			}
 
 			$entry = new FreshRSS_Entry(