valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Richard Beales 2013-03-17 08:03:39 +00:00
parent ffbab555b8 c722ce3b96
commit 70db7424e7
2 changed files with 1217 additions and 2048 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/rssfuncs.php
View File

@ -569,7 +569,6 @@
$entry_tags = $article["tags"]; $entry_tags = $article["tags"];
$entry_guid = db_escape_string($entry_guid); $entry_guid = db_escape_string($entry_guid);
$entry_content = db_escape_string($article["content"], false);
$entry_title = db_escape_string($article["title"]); $entry_title = db_escape_string($article["title"]);
$entry_author = db_escape_string($article["author"]); $entry_author = db_escape_string($article["author"]);
$entry_link = db_escape_string($article["link"]); $entry_link = db_escape_string($article["link"]);
@ -582,6 +581,8 @@
if ($cache_images && is_writable(CACHE_DIR . '/images')) if ($cache_images && is_writable(CACHE_DIR . '/images'))
$entry_content = cache_images($entry_content, $site_url, $debug_enabled); $entry_content = cache_images($entry_content, $site_url, $debug_enabled);
$entry_content = db_escape_string($article["content"], false);
$content_hash = "SHA1:" . sha1($entry_content); $content_hash = "SHA1:" . sha1($entry_content);
db_query($link, "BEGIN"); db_query($link, "BEGIN");

3262
locale/hu_HU/LC_MESSAGES/messages.po
View File

File diff suppressed because it is too large Load Diff