From ae54a143860bad200a0ef319052ccec512ef99e3 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Sat, 23 Aug 2014 21:37:37 +0200 Subject: Fix problem with starred files for import/export Improve guessFileType method See https://github.com/marienfressinaud/FreshRSS/issues/494 --- app/Controllers/importExportController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/Controllers/importExportController.php') diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php index 2197c3af5..b3683f385 100644 --- a/app/Controllers/importExportController.php +++ b/app/Controllers/importExportController.php @@ -116,7 +116,8 @@ class FreshRSS_importExport_Controller extends Minz_ActionController { } elseif (substr_compare($filename, '.opml', -5) === 0 || substr_compare($filename, '.xml', -4) === 0) { return 'opml'; - } elseif (strcmp($filename, 'starred.json') === 0) { + } elseif (substr_compare($filename, '.json', -5) === 0 && + strpos($filename, 'starred') !== false) { return 'json_starred'; } elseif (substr_compare($filename, '.json', -5) === 0 && strpos($filename, 'feed_') === 0) { -- cgit v1.2.3