servers
/
ttrss
mirror of https://tt-rss.org/git/tt-rss.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of git.fakecake.org:tt-rss

This commit is contained in:
Andrew Dolgov 2017-11-20 08:48:28 +03:00
parent 2352c320c2 99d770ca54
commit d2957a2718
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions.php
View File

@ -1663,7 +1663,7 @@
'caption', 'cite', 'center', 'code', 'col', 'colgroup',
'data', 'dd', 'del', 'details', 'description', 'dfn', 'div', 'dl', 'font',
'dt', 'em', 'footer', 'figure', 'figcaption',
'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'header', 'html', 'i',
'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'header', 'hr', 'html', 'i',
'img', 'ins', 'kbd', 'li', 'main', 'mark', 'nav', 'noscript',
'ol', 'p', 'pre', 'q', 'ruby', 'rp', 'rt', 's', 'samp', 'section',
'small', 'source', 'span', 'strike', 'strong', 'sub', 'summary',

BIN
locale/de_DE/LC_MESSAGES/messages.mo
View File

Binary file not shown.

2
locale/de_DE/LC_MESSAGES/messages.po
View File

@ -3371,7 +3371,7 @@ msgstr "Keine Profile ausgewählt."
#: js/prefs.js:1353 js/prefs.js:1406
msgid "Activate selected profile?"
msgstr "Ausgewählte Profile entfernen?"
msgstr "Ausgewählte Profile aktivieren?"
#: js/prefs.js:1370 js/prefs.js:1422
msgid "Please choose a profile to activate."

4
plugins/af_comics/init.php
View File

@ -65,7 +65,7 @@ class Af_Comics extends Plugin {
}
print "</ul>";
print "<p>".__('GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>).')."</p>";
print "<p>".__("To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>).")."</p>";
print "<p>".__('Drop any updated filters into <code>filters.local</code> in plugin directory.')."</p>";
@ -89,7 +89,7 @@ class Af_Comics extends Plugin {
if ($auth_login || $auth_pass)
return $feed_data;
if (preg_match('#^https?://feeds.feedburner.com/uclick/([-a-z]+)#', $fetch_url, $comic)) {
if (preg_match('#^https?://(?:feeds\.feedburner\.com/uclick|www\.gocomics\.com)/([-a-z0-9]+)$#i', $fetch_url, $comic)) {
$site_url = 'http://www.gocomics.com/' . $comic[1];
$article_link = $site_url . date('/Y/m/d');

1
prefs.php
View File

@ -31,6 +31,7 @@
<html>
<head>
<title>Tiny Tiny RSS : <?php echo __("Preferences") ?></title>
<meta name="viewport" content="initial-scale=1,width=device-width" />
<script type="text/javascript">
var __ttrss_version = "<?php echo VERSION ?>"