diff options
| author | Andrew Dolgov <[email protected]> | 2013-04-04 10:21:48 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-04-04 10:21:48 +0400 |
| commit | 61096207b6b856a67a062dd7fdfc4e8724f3b2ec (patch) | |
| tree | 30c15f232cac92047ae26ed476f8a5755175a7f6 /plugins | |
| parent | ae31704bb3dfc55b960f58551fdf7367959a3f54 (diff) | |
add several checks to googleimportplugin to make importing more stable
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/googlereaderimport/init.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/plugins/googlereaderimport/init.php b/plugins/googlereaderimport/init.php index da5e9adb1..8f14bdaa7 100644 --- a/plugins/googlereaderimport/init.php +++ b/plugins/googlereaderimport/init.php @@ -125,14 +125,14 @@ class GoogleReaderImport extends Plugin { if (strpos($item['origin']['streamId'], 'feed/') === 0) { $orig_feed_data['feed_url'] = db_escape_string($this->link, - preg_replace("/^feed\//", - "", $item['origin']['streamId'])); + mb_substr(preg_replace("/^feed\//", + "", $item['origin']['streamId']), 0, 200)); $orig_feed_data['title'] = db_escape_string($this->link, - $item['origin']['title']); + mb_substr($item['origin']['title'], 0, 200)); $orig_feed_data['site_url'] = db_escape_string($this->link, - $item['origin']['htmlUrl']); + mb_substr($item['origin']['htmlUrl'], 0, 200)); } } @@ -225,7 +225,7 @@ class GoogleReaderImport extends Plugin { } } - if ($feed_id) { + if ($feed_id && $feed_id != 'NULL') { // locate archived entry to file entries in, we don't want to file them in actual feeds because of purging // maybe file marked in real feeds because eh @@ -254,6 +254,8 @@ class GoogleReaderImport extends Plugin { db_query($this->link, "DELETE FROM ttrss_feeds WHERE id = $feed_id"); } + if (!$orig_feed_id) $orig_feed_id = 'NULL'; + $result = db_query($this->link, "SELECT id FROM ttrss_entries, ttrss_user_entries WHERE guid = '$guid' AND ref_id = id AND owner_uid = '$owner_uid' LIMIT 1"); |