diff options
| author | Andrew Dolgov <[email protected]> | 2008-11-20 08:27:45 +0100 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2008-11-20 08:27:45 +0100 |
| commit | c54526fe2d8dc9fcd70712e7d2e81f071c600bb8 (patch) | |
| tree | 86dabbe62d69a0875ec1c0e13179609023221ef6 | |
| parent | ff39ff9ba14ab237fdfac06ee9bd47191e21c96b (diff) | |
image attachment display: make possible duplicate detection actually do something
| -rw-r--r-- | functions.php | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/functions.php b/functions.php index 48d6e3a85..5dc85264a 100644 --- a/functions.php +++ b/functions.php @@ -4754,13 +4754,14 @@ #print "<div id=\"allEntryTags\">".__('Tags:')." $f_tags_str</div>"; - $line["content"] = sanitize_rss($link, $line["content"]); + $article_content = sanitize_rss($link, $line["content"]); if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW')) { - $line["content"] = preg_replace("/href=/i", "target=\"_blank\" href=", $line["content"]); + $article_content = preg_replace("/href=/i", "target=\"_blank\" href=", + $article_content); } - print $line["content"]; + print $article_content; $result = db_query($link, "SELECT * FROM ttrss_enclosures WHERE post_id = '$id' AND content_url != ''"); @@ -4802,14 +4803,9 @@ array_push($entries, $entry); } - if (!preg_match("/img/i", $line["content"]) && - preg_match("/image/", $entries[0]["type"])) { - - } - print "<div class=\"postEnclosures\">"; - if (!preg_match("/img/i", $line["content"])) { + if (!preg_match("/img/i", $article_content)) { foreach ($entries as $entry) { if (preg_match("/image/", $entry["type"])) { print "<p><img @@ -5293,6 +5289,7 @@ // print "<div class=\"cdmInnerContent\" id=\"CICD-$id\" $cdm_cstyle>"; print sanitize_rss($link, $line["content_preview"]); + $article_content = $line["content_preview"]; $e_result = db_query($link, "SELECT * FROM ttrss_enclosures WHERE post_id = '$id' AND content_url != ''"); @@ -5333,7 +5330,7 @@ array_push($entries, $entry); } - if (!preg_match("/img/i", $line["content"])) { + if (!preg_match("/img/i", $article_content)) { foreach ($entries as $entry) { if (preg_match("/image/", $entry["type"])) { print "<p><img |