another attempt to enforce session ID regeneration on login

[tt-rss.git] / classes / rssutils.php

diff --git a/classes/rssutils.php b/classes/rssutils.php
index 5a1a9467c804148eb931b93d4df6fb5e78491da0..094b294084f2b8509c70cbbc7199b692a84852cd 100755 (executable)
--- a/classes/rssutils.php
+++ b/classes/rssutils.php
@@ -187,7 +187,12 @@ class RSSUtils {
                                        array_push($batch_owners, $tline["owner_uid"]);
 
                                $fstarted = microtime(true);
-                               RSSUtils::update_rss_feed($tline["id"], true, false);
+
+                               try {
+                                       RSSUtils::update_rss_feed($tline["id"], true, false);
+                               } catch (PDOException $e) {
+                                       Logger::get()->log_error(E_USER_NOTICE, $e->getMessage(), $e->getFile(), $e->getLine(), $e->getTraceAsString());
+                               }
                                _debug_suppress(false);
 
                                _debug(sprintf("    %.4f (sec)", microtime(true) - $fstarted));
@@ -1213,7 +1218,7 @@ class RSSUtils {
                                        if ($file_content && strlen($file_content) > MIN_CACHE_FILE_SIZE) {
                                                file_put_contents($local_filename, $file_content);
                                        }
-                               } else {
+                               } else if (is_writable($local_filename)) {
                                        touch($local_filename);
                                }
                        }
@@ -1249,7 +1254,7 @@ class RSSUtils {
                                        if ($file_content && strlen($file_content) > MIN_CACHE_FILE_SIZE) {
                                                file_put_contents($local_filename, $file_content);
                                        }
-                               } else {
+                               } else if (is_writable($local_filename)) {
                                        touch($local_filename);
                                }
                        }