From fc5cd15819dfc603e137a24d85239a15ab6cb1ee Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 31 Mar 2013 09:52:50 +0400 Subject: googlereaderimport: disable creation of archived feeds until the SQL thing is resolved --- plugins/googlereaderimport/init.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/googlereaderimport/init.php b/plugins/googlereaderimport/init.php index 16430f8c0..1c9f3b8bf 100644 --- a/plugins/googlereaderimport/init.php +++ b/plugins/googlereaderimport/init.php @@ -171,6 +171,8 @@ class GoogleReaderImport extends Plugin { if (!$guid) $guid = sha1($link); + $create_archived_feeds = false; // may cause SQL errors SOMEHOW, thus disabled for the time being + $guid = "$owner_uid,$guid"; $content_hash = sha1($content); @@ -187,7 +189,7 @@ class GoogleReaderImport extends Plugin { // before dealing with archived feeds we must check ttrss_feeds to maintain id consistency - if ($orig_feed_data['feed_url']) { + if ($orig_feed_data['feed_url'] && $create_archived_feeds) { $result = db_query($this->link, "SELECT id FROM ttrss_feeds WHERE feed_url = '".$orig_feed_data['feed_url']."' AND owner_uid = $owner_uid"); -- cgit v1.2.3