More DB query updates.

plugins/FeedsHTTPFetcher.inc

@@ -226,7 +226,7 @@ class PuSHSubscription implements PuSHSubscriptionInterface {
    * Load a subscription.
    */
   public static function load($domain, $subscriber_id) {
-    if ($v = db_fetch_array(db_query("SELECT * FROM {feeds_push_subscriptions} WHERE domain = '%s' AND subscriber_id = %d", $domain, $subscriber_id))) {
+    if ($v = db_query("SELECT * FROM {feeds_push_subscriptions} WHERE domain = :domain AND subscriber_id = :sid", array(':domain' => $domain, ':sid' => $subscriber_id))->fetchAssoc()) {
       $v['post_fields'] = unserialize($v['post_fields']);
       return new PuSHSubscription($v['domain'], $v['subscriber_id'], $v['hub'], $v['topic'], $v['secret'], $v['status'], $v['post_fields'], $v['timestamp']);
     }

plugins/FeedsTermProcessor.inc

@@ -89,14 +89,18 @@ class FeedsTermProcessor extends FeedsProcessor {
   public function clear(FeedsBatch $batch, FeedsSource $source) {
     $deleted = 0;
     $vocabulary = $this->vocabulary();
-    $result = db_query("SELECT td.tid
+    $terms = db_query("SELECT td.tid
                         FROM {term_data} td
                         JOIN {feeds_term_item} ft ON td.tid = ft.tid
-                        WHERE td.vid = %d
-                        AND ft.id = '%s'
-                        AND ft.feed_nid = %d",
-                        $vocabulary->vid, $this->id, $source->feed_nid);
-    while ($term = db_fetch_object($result)) {
+                        WHERE td.vid = :vid
+                        AND ft.id = :id
+                        AND ft.feed_nid = :feed_nid",
+                        array(
+                          ':vid' => $vocabulary->vid,
+                          ':id' => $this->id,
+                          ':feed_nid' => $source->feed_nid,
+                        ));
+    foreach ($terms as $term) {
       if (taxonomy_del_term($term->tid) == SAVED_DELETED) {
         $deleted++;
       }