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

Merge branch 'master' of madoka.volgo-balt.ru:public_html/testbox/tt-rss

This commit is contained in:
Andrew Dolgov 2010-10-03 11:54:20 +04:00
parent 66438f2922 5ba53dde35
commit 3b3a199df8
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/opml_domdoc.php
View File

@ -37,6 +37,10 @@
} }
$feed_url = db_escape_string($outline->attributes->getNamedItem('xmlUrl')->nodeValue); $feed_url = db_escape_string($outline->attributes->getNamedItem('xmlUrl')->nodeValue);
if (!$feed_url)
$feed_url = db_escape_string($outline->attributes->getNamedItem('xmlURL')->nodeValue);
$site_url = db_escape_string($outline->attributes->getNamedItem('htmlUrl')->nodeValue); $site_url = db_escape_string($outline->attributes->getNamedItem('htmlUrl')->nodeValue);
$pref_name = db_escape_string($outline->attributes->getNamedItem('pref-name')->nodeValue); $pref_name = db_escape_string($outline->attributes->getNamedItem('pref-name')->nodeValue);

4
modules/opml_domxml.php
View File

@ -39,6 +39,10 @@
} }
$feed_url = db_escape_string($outline->get_attribute('xmlUrl')); $feed_url = db_escape_string($outline->get_attribute('xmlUrl'));
if (!$feed_url)
$feed_url = db_escape_string($outline->get_attribute('xmlURL'));
$site_url = db_escape_string($outline->get_attribute('htmlUrl')); $site_url = db_escape_string($outline->get_attribute('htmlUrl'));
if ($cat_title && !$feed_url) { if ($cat_title && !$feed_url) {

5
prefs.js
View File

@ -1456,8 +1456,7 @@ function pref_hotkey_handler(e) {
} }
if ($("piggie")) { if ($("piggie")) {
if (seq.match("8073717369")) {
if (seq.match("807371717369")) {
seq = ""; seq = "";
piggie(true); piggie(true);
} else { } else {
@ -1480,6 +1479,8 @@ function editFeedCats() {
try { try {
var query = "?op=pref-feeds&subop=editCats"; var query = "?op=pref-feeds&subop=editCats";
notify_progress("Loading, please wait...");
new Ajax.Request("backend.php", { new Ajax.Request("backend.php", {
parameters: query, parameters: query,
onComplete: function(transport) { onComplete: function(transport) {

2
update_daemon2.php
View File

@ -73,7 +73,7 @@
if (time() - $started > MAX_CHILD_RUNTIME) { if (time() - $started > MAX_CHILD_RUNTIME) {
_debug("[MASTER] child process $pid seems to be stuck, aborting..."); _debug("[MASTER] child process $pid seems to be stuck, aborting...");
posix_kill($pid, SIGINT); posix_kill($pid, SIGKILL);
} }
} }
} }