diff options
| author | Andrew Dolgov <[email protected]> | 2012-12-30 12:22:29 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2012-12-30 12:22:29 +0400 |
| commit | 9e222305f7e850ba464d2d34d6e87fd0ff5cdeaf (patch) | |
| tree | 724ae9e01937594eaadb33b7d984f1f839a59cfa /include | |
| parent | 455b1401cdd26ca92a668b767e9205b9e3d9e645 (diff) | |
allow plugin modification of article guid
Diffstat (limited to 'include')
| -rw-r--r-- | include/rssfuncs.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/rssfuncs.php b/include/rssfuncs.php index bd583bbf0..0a838432d 100644 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -479,9 +479,6 @@ $entry_guid = db_escape_string(mb_substr($entry_guid, 0, 245)); - $result = db_query($link, "SELECT id FROM ttrss_entries - WHERE guid = '$entry_guid'"); - $entry_comments = db_escape_string(mb_substr($entry_comments, 0, 245)); $entry_author = db_escape_string(mb_substr($entry_author, 0, 245)); @@ -540,7 +537,7 @@ } $article = array("owner_uid" => $owner_uid, // read only - "guid" => $entry_guid, // read only + "guid" => $entry_guid, "title" => $entry_title, "content" => $entry_content, "link" => $entry_link, @@ -548,24 +545,27 @@ "author" => $entry_author); foreach ($pluginhost->get_hooks($pluginhost::HOOK_ARTICLE_FILTER) as $plugin) { - $article = $plugin->hook_article_filter($article); } $entry_tags = $article["tags"]; + $entry_guid = db_escape_string($article["guid"]); $entry_content = db_escape_string($article["content"], false); $entry_title = db_escape_string($article["title"]); $entry_author = db_escape_string($article["author"]); $entry_link = db_escape_string($article["link"]); - $content_hash = "SHA1:" . sha1(strip_tags($entry_content)); + $content_hash = "SHA1:" . sha1($entry_content); db_query($link, "BEGIN"); + $result = db_query($link, "SELECT id FROM ttrss_entries + WHERE guid = '$entry_guid'"); + if (db_num_rows($result) == 0) { if ($debug_enabled) { - _debug("update_rss_feed: base guid not found"); + _debug("update_rss_feed: base guid [$entry_guid] not found"); } if ($cache_content) { @@ -646,7 +646,7 @@ if (db_num_rows($result) == 1) { if ($debug_enabled) { - _debug("update_rss_feed: base guid found, checking for user record"); + _debug("update_rss_feed: base guid [$entry_guid] found, checking for user record"); } // this will be used below in update handler |