diff options
author | Andrew Dolgov <[email protected]> | 2009-11-22 23:19:32 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2009-11-22 23:19:32 +0300 |
commit | 6061ca7624a2a173babe97f03e66a748a9dd2cde (patch) | |
tree | 94711ff281157ef1abbf9f1684ed8661bee947aa /functions.php | |
parent | 3775927b284c23bb28d0de0cb923a002d5321e7d (diff) | |
parent | a3162add37d5e4468a044dce7d4aad96594a2c54 (diff) |
Merge branch 'master' of /home/fox/public_html/testbox/tt-rss
Diffstat (limited to 'functions.php')
-rw-r--r-- | functions.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/functions.php b/functions.php index 0dae38842..9d32e98f3 100644 --- a/functions.php +++ b/functions.php @@ -23,6 +23,7 @@ function get_translations() { $tr = array( "auto" => "Detect automatically", + "ca_CA" => "Català", "en_US" => "English", "es_ES" => "Español", "de_DE" => "Deutsch", @@ -3528,7 +3529,7 @@ print "</div>"; } - print sanitize_rss($link, $line["content_preview"]); + print sanitize_rss($link, $line["content_preview"], false, $owner_uid); print "]]></description>"; print "</item>"; @@ -3590,10 +3591,12 @@ } */ - function sanitize_rss($link, $str, $force_strip_tags = false) { + function sanitize_rss($link, $str, $force_strip_tags = false, $owner = false) { $res = $str; - if (get_pref($link, "STRIP_UNSAFE_TAGS") || $force_strip_tags) { + if (!$owner) $owner = $_SESSION["uid"]; + + if (get_pref($link, "STRIP_UNSAFE_TAGS", $owner) || $force_strip_tags) { // $res = strip_tags_long($res, // "<p><a><i><em><b><strong><code><pre><blockquote><br><img><ul><ol><li>"); @@ -3603,7 +3606,7 @@ } - if (get_pref($link, "STRIP_IMAGES")) { + if (get_pref($link, "STRIP_IMAGES", $owner)) { $res = preg_replace('/<img[^>]+>/is', '', $res); |