Merge branch 'master' of git.moodle.org:/git/integration

diff --git a/blog/lib.php b/blog/lib.php
index a8bd8f7..1137e8e 100644 (file)
--- a/blog/lib.php
+++ b/blog/lib.php
@@ -261,10 +261,16 @@ function blog_sync_external_entries($externalblog) {
         }
     }
 
-    //Look at the posts we have in the database to check if any of them have been deleted from the feed.
-    //Only checking posts within the time frame returned by the rss feed. Older items may have been deleted or
-    //may just not be returned anymore. We cant tell the difference so we leave older posts alone.
-    $dbposts = $DB->get_records_select('post', 'created > :ts', array('ts' => $oldesttimestamp), '', 'id, uniquehash');
+    // Look at the posts we have in the database to check if any of them have been deleted from the feed.
+    // Only checking posts within the time frame returned by the rss feed. Older items may have been deleted or
+    // may just not be returned anymore. We can't tell the difference so we leave older posts alone.
+    $sql = "SELECT id, uniquehash
+              FROM {post}
+             WHERE module = 'blog_external'
+                   AND " . $DB->sql_compare_text('content') . " = " . $DB->sql_compare_text(':blogid') . "
+                   AND created > :ts";
+    $dbposts = $DB->get_records_sql($sql, array('blogid' => $externalblog->id, 'ts' => $oldesttimestamp));
+
     $todelete = array();
     foreach($dbposts as $dbpost) {
         if ( !in_array($dbpost->uniquehash, $uniquehashes) ) {