Index: akismet_cron.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/akismet/akismet_cron.inc,v
retrieving revision 1.5
diff -u -p -r1.5 akismet_cron.inc
--- akismet_cron.inc	24 Mar 2008 23:31:16 -0000	1.5
+++ akismet_cron.inc	3 Apr 2009 10:09:11 -0000
@@ -15,8 +15,8 @@ function akismet_cron_shutdown() {
   // Retrieve the list of expired content spam, based on the age specified in the settings panel.
   $expire_spam_age = variable_get('akismet_remove_spam_age', 259200);
   if ($expire_spam_age > 0) {
-    $result = db_result(db_query('SELECT content_type, content_id FROM {akismet_spam_marks} WHERE spam_created < %d', time() - $expire_spam_age));
-    while ($s = db_fetch_object($result)) {
+    $query = db_query('SELECT content_type, content_id FROM {akismet_spam_marks} WHERE spam_created < %d', time() - $expire_spam_age);
+    while ($s = db_fetch_object($query)) {
       $key = ($s->content_type == 'node' ? 'nids' : 'cids');
       $expired_content_spam[$key][] = $s->content_id;
       $obsolete_spam_marks[$key][] = $s->content_id;
@@ -28,14 +28,14 @@ function akismet_cron_shutdown() {
   // so that may lead to orphans in the 'spam marks' table.
   // This is why this cron task is being more complex that it could really be. Anyway, these
   // queries shouldn't be too heavy.
-  $result = db_result(db_query('SELECT s.content_id FROM {akismet_spam_marks} s LEFT JOIN {node} n ON s.content_id = n.nid WHERE s.content_type = \'node\' AND n.nid IS NULL'));
-  while ($s = db_fetch_object($result)) {
+  $query = db_query('SELECT s.content_id FROM {akismet_spam_marks} s LEFT JOIN {node} n ON s.content_id = n.nid WHERE s.content_type = \'node\' AND n.nid IS NULL');
+  while ($s = db_fetch_object($query)) {
     if (!in_array($s->content_id, $obsolete_spam_marks['nids'])) {
       $obsolete_spam_marks['nids'][] = $s->content_id;
     }
   }
-  $result = db_result(db_query('SELECT s.content_id FROM {akismet_spam_marks} s LEFT JOIN {comments} c ON s.content_id = c.cid WHERE s.content_type = \'comment\' AND c.cid IS NULL'));
-  while ($s = db_fetch_object($result)) {
+  $query = db_query('SELECT s.content_id FROM {akismet_spam_marks} s LEFT JOIN {comments} c ON s.content_id = c.cid WHERE s.content_type = \'comment\' AND c.cid IS NULL');
+  while ($s = db_fetch_object($query)) {
     if (!in_array($s->content_id, $obsolete_spam_marks['cids'])) {
       $obsolete_spam_marks['cids'][] = $s->content_id;
     }