diff options
| author | Andrew Dolgov <[email protected]> | 2015-08-11 09:05:39 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2015-08-11 09:05:39 +0300 |
| commit | 023737c75697d176b02c1e150f9406e6a1a8fd8b (patch) | |
| tree | 3f75fa3f0f882b52bb6b8163cf3f68c3eec5ec76 | |
| parent | 837443630f5aeb25d34cd93d7a7d63442e8ae2b6 (diff) | |
| parent | 1f6732b245c9ea77bca9415653d2c993a02c8ca4 (diff) | |
Merge branch 'master' of git.fakecake.org:tt-rss
| -rw-r--r-- | classes/pref/feeds.php | 11 | ||||
| -rw-r--r-- | include/functions2.php | 3 | ||||
| -rw-r--r-- | include/rssfuncs.php | 14 | ||||
| -rw-r--r-- | plugins/af_redditimgur/init.php | 2 |
4 files changed, 21 insertions, 9 deletions
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 01197d92c..96a234af0 100644 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -991,6 +991,11 @@ class Pref_Feeds extends Handler_Protected { if (!$batch) { + $result = db_query("SELECT feed_url FROM ttrss_feeds WHERE id = " . $feed_id); + $orig_feed_url = db_fetch_result($result, 0, "feed_url"); + + $reset_basic_info = $orig_feed_url != $feed_link; + $this->dbh->query("UPDATE ttrss_feeds SET $category_qpart title = '$feed_title', feed_url = '$feed_link', @@ -1008,6 +1013,12 @@ class Pref_Feeds extends Handler_Protected { feed_language = '$feed_language' WHERE id = '$feed_id' AND owner_uid = " . $_SESSION["uid"]); + if ($reset_basic_info) { + require_once "rssfuncs.php"; + + set_basic_feed_info($feed_id); + } + PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_SAVE_FEED, "hook_prefs_save_feed", $feed_id); diff --git a/include/functions2.php b/include/functions2.php index 418dbc95b..59f6caa88 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -739,7 +739,8 @@ marked, published, last_marked, - last_published + last_published, + last_read FROM $from_qpart WHERE diff --git a/include/rssfuncs.php b/include/rssfuncs.php index c8e2ce28f..6532fb270 100644 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -796,7 +796,7 @@ $entry_content = db_escape_string($entry_content, false); - db_query("BEGIN"); + //db_query("BEGIN"); $result = db_query("SELECT id FROM ttrss_entries WHERE (guid = '$entry_guid' OR guid = '$entry_guid_hashed')"); @@ -889,7 +889,7 @@ } if (find_article_filter($article_filters, "filter")) { - db_query("COMMIT"); // close transaction in progress + //db_query("COMMIT"); // close transaction in progress continue; } @@ -1020,7 +1020,7 @@ } } - db_query("COMMIT"); + //db_query("COMMIT"); _debug("assigning labels [other]...", $debug_enabled); @@ -1054,7 +1054,7 @@ print_r($enclosures); } - db_query("BEGIN"); + //db_query("BEGIN"); // debugging // db_query("DELETE FROM ttrss_enclosures WHERE post_id = '$entry_ref_id'"); @@ -1077,7 +1077,7 @@ } } - db_query("COMMIT"); + //db_query("COMMIT"); // check for manual tags (we have to do it here since they're loaded from filters) @@ -1121,7 +1121,7 @@ if (count($filtered_tags) > 0) { - db_query("BEGIN"); + //db_query("BEGIN"); foreach ($filtered_tags as $tag) { @@ -1154,7 +1154,7 @@ SET tag_cache = '$tags_str' WHERE ref_id = '$entry_ref_id' AND owner_uid = $owner_uid"); - db_query("COMMIT"); + //db_query("COMMIT"); } _debug("article processed", $debug_enabled); diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php index f3d8b28b4..e7658120d 100644 --- a/plugins/af_redditimgur/init.php +++ b/plugins/af_redditimgur/init.php @@ -95,7 +95,7 @@ class Af_RedditImgur extends Plugin { if ($tmpdoc) { $tmpxpath = new DOMXPath($tmpdoc); - $source_meta = $tmpxpath->query("//meta[@property='og:video']")->item(0); + $source_meta = $tmpxpath->query("//meta[@name='twitter:player:stream' and contains(@content, '.mp4')]")->item(0); $poster_meta = $tmpxpath->query("//meta[@property='og:image' and contains(@content,'thumbs.gfycat.com')]")->item(0); if ($source_meta) { |