diff options
| author | Andrew Dolgov <[email protected]> | 2010-10-03 11:54:20 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2010-10-03 11:54:20 +0400 |
| commit | 3b3a199df86b1c94d16e6c0f601e3988df37070f (patch) | |
| tree | d7ee21ee3595115bd757d2ca9d978c2a77ddac2d | |
| parent | 66438f2922dad7b3a6d36bc22a06b3566fd9becf (diff) | |
| parent | 5ba53dde355add2f6098887611b5d2a7eb32b44b (diff) | |
Merge branch 'master' of madoka.volgo-balt.ru:public_html/testbox/tt-rss
| -rw-r--r-- | modules/opml_domdoc.php | 4 | ||||
| -rw-r--r-- | modules/opml_domxml.php | 4 | ||||
| -rw-r--r-- | prefs.js | 5 | ||||
| -rwxr-xr-x | update_daemon2.php | 2 |
4 files changed, 12 insertions, 3 deletions
diff --git a/modules/opml_domdoc.php b/modules/opml_domdoc.php index a1efb1e93..08715093a 100644 --- a/modules/opml_domdoc.php +++ b/modules/opml_domdoc.php @@ -37,6 +37,10 @@ } $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); $pref_name = db_escape_string($outline->attributes->getNamedItem('pref-name')->nodeValue); diff --git a/modules/opml_domxml.php b/modules/opml_domxml.php index 1cc1467a8..8262c3040 100644 --- a/modules/opml_domxml.php +++ b/modules/opml_domxml.php @@ -39,6 +39,10 @@ } $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')); if ($cat_title && !$feed_url) { @@ -1456,8 +1456,7 @@ function pref_hotkey_handler(e) { } if ($("piggie")) { - - if (seq.match("807371717369")) { + if (seq.match("8073717369")) { seq = ""; piggie(true); } else { @@ -1480,6 +1479,8 @@ function editFeedCats() { try { var query = "?op=pref-feeds&subop=editCats"; + notify_progress("Loading, please wait..."); + new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { diff --git a/update_daemon2.php b/update_daemon2.php index ce6a3ee9c..053a73d7d 100755 --- a/update_daemon2.php +++ b/update_daemon2.php @@ -73,7 +73,7 @@ if (time() - $started > MAX_CHILD_RUNTIME) { _debug("[MASTER] child process $pid seems to be stuck, aborting..."); - posix_kill($pid, SIGINT); + posix_kill($pid, SIGKILL); } } } |