diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-08-23 21:37:37 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-08-23 21:37:37 +0200 |
| commit | ae54a143860bad200a0ef319052ccec512ef99e3 (patch) | |
| tree | 4da480ae7456d4244ebb847ae2fbbfd69a8158be /app/Controllers/importExportController.php | |
| parent | 17cf6fae6b7d5219f26341dc2829fe6f103e4aab (diff) | |
Fix problem with starred files for import/export
Improve guessFileType method
See https://github.com/marienfressinaud/FreshRSS/issues/494
Diffstat (limited to 'app/Controllers/importExportController.php')
| -rw-r--r-- | app/Controllers/importExportController.php | 3 |
1 files changed, 2 insertions, 1 deletions
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) { |