]> git.wh0rd.org - tt-rss.git/commitdiff
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
authorAndrew Dolgov <noreply@fakecake.org>
Sun, 2 Nov 2014 16:37:27 +0000 (19:37 +0300)
committerAndrew Dolgov <noreply@fakecake.org>
Sun, 2 Nov 2014 16:37:27 +0000 (19:37 +0300)
1  2 
include/rssfuncs.php

diff --combined include/rssfuncs.php
index 1c1f18269b64a73e8638f61b9cfdc813ffc8cd14,1a3c2bc4313dcfcc670d68bd1e51826401cb9624..807b041a36ca64ed9b430595ab63d75704b46cde
  
                        if (!$registered_title || $registered_title == "[Unknown]") {
  
 -                              $feed_title = db_escape_string($rss->get_title());
 +                              $feed_title = db_escape_string(mb_substr($rss->get_title(), 0, 199);
  
                                if ($feed_title) {
                                        _debug("registering title: $feed_title", $debug_enabled);
                                        db_query("UPDATE ttrss_entries SET date_updated = NOW()
                                                WHERE id = '$base_entry_id'");
  
-                                       continue;
+                     // if we allow duplicate posts, we have to continue to 
+                     // create the user entries for this feed
+                     if (!get_pref("ALLOW_DUPLICATE_POSTS", $owner_uid, false)) {
+                         continue;
+                     }
                                }
  
                                _debug("hash differs, applying plugin filters:", $debug_enabled);