diff options
| author | 2014-12-07 14:39:02 +0100 | |
|---|---|---|
| committer | 2014-12-07 14:39:02 +0100 | |
| commit | 7ef4d6c033d6d12a644b6cf39940591901fdcb3b (patch) | |
| tree | dc7b349702020c9ad81d21a73f14c7eee7712b3e /app/Controllers/feedController.php | |
| parent | 5932c3427b060d4f0aeab92d7ed17c8e8d4fd1d7 (diff) | |
Fix entry_before_insert hook
The hook must be called also in:
- feedController->addAction()
- importExportController->importJson()
See https://github.com/FreshRSS/FreshRSS/issues/252
Diffstat (limited to 'app/Controllers/feedController.php')
| -rwxr-xr-x | app/Controllers/feedController.php | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php index dce79c57a..0a7edbee3 100755 --- a/app/Controllers/feedController.php +++ b/app/Controllers/feedController.php @@ -174,10 +174,17 @@ class FreshRSS_feed_Controller extends Minz_ActionController { $feedDAO->beginTransaction(); foreach ($entries as $entry) { // Entries are added without any verification. + $entry->_feed($feed->id()); + $entry->_id(min(time(), $entry->date(true)) . uSecString()); + $entry->_isRead($is_read); + + $entry = Minz_ExtensionManager::callHook('entry_before_insert', $entry); + if (is_null($entry)) { + // An extension has returned a null value, there is nothing to insert. + continue; + } + $values = $entry->toArray(); - $values['id_feed'] = $feed->id(); - $values['id'] = min(time(), $entry->date(true)) . uSecString(); - $values['is_read'] = $is_read; $entryDAO->addEntry($values, $prepared_statement); } $feedDAO->updateLastUpdate($feed->id()); |
