Index: subscription.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/subscription/subscription.module,v
retrieving revision 1.10
diff -u -F^f -r1.10 subscription.module
--- subscription.module	30 Sep 2005 06:41:49 -0000	1.10
+++ subscription.module	26 Nov 2005 22:54:43 -0000
@@ -270,7 +270,7 @@ function subscription_cron() {
 function subscription_get_all($diggest = false) {
   $rules = array();
   $diggest = ($diggest ? 1 : 0);
-  $result = db_query("SELECT s.*,c.name,c.id FROM {subscription_subscriptions} s LEFT JOIN {subscription_channels} c ON s.cid=c.cid WHERE c.daily=%d ORDER BY uid, cid, object, condition", $diggest);
+  $result = db_query("SELECT s.*,c.name,c.id FROM {subscription_subscriptions} s LEFT JOIN {subscription_channels} c ON s.cid=c.cid WHERE c.daily=%d ORDER BY uid, cid, object, `condition`", $diggest);
   while ($rule = db_fetch_array($result)) {
     $rules[] = $rule;
   }  
@@ -316,7 +316,7 @@ function subscription_get_channelhandler
 function subscription_get() {
   global $user;
   $rules = array();
-  $result = db_query("SELECT s.*,c.name,c.id FROM {subscription_subscriptions} s LEFT JOIN {subscription_channels} c ON  s.cid=c.cid WHERE s.uid = %d ORDER BY uid, cid, object, condition", $user->uid);
+  $result = db_query("SELECT s.*,c.name,c.id FROM {subscription_subscriptions} s LEFT JOIN {subscription_channels} c ON  s.cid=c.cid WHERE s.uid = %d ORDER BY uid, cid, object, `condition`", $user->uid);
   while ($rule = db_fetch_array($result)) {
     $rules[] = $rule;
   }  
@@ -398,7 +398,7 @@ function subscription_store($type, $cond
   }
   $condition = serialize($condition);
   $sid = db_next_id("subscribe_subscription", "sid");
-  db_query("INSERT INTO {subscription_subscriptions} (sid,uid,object,condition,cid) VALUES (%d,%d,'%s','%s',%d)", $sid, $user->uid, $type, $condition, $channel);
+  db_query("INSERT INTO {subscription_subscriptions} (sid,uid,object,`condition`,cid) VALUES (%d,%d,'%s','%s',%d)", $sid, $user->uid, $type, $condition, $channel);
   return $sid;
  }
  /**
@@ -408,7 +408,7 @@ function subscription_is_subscribed($typ
   global $user;
   $condition = serialize($condition);
   $sid = db_next_id("subscribe_subscription", "sid");
-  $result = db_query("SELECT * FROM {subscription_subscriptions} WHERE uid=%d AND object='%s' AND condition='%s' AND cid=%d", $user->uid, $type, $condition, subscription_get_default_channel());
+  $result = db_query("SELECT * FROM {subscription_subscriptions} WHERE uid=%d AND object='%s' AND `condition`='%s' AND cid=%d", $user->uid, $type, $condition, subscription_get_default_channel());
   $role = db_fetch_array($result);
   return $role;
  }
@@ -563,7 +563,7 @@ function subscription_list() {
     }
     if (!form_get_errors()) {
       $sid = db_next_id("subscribe_subscription", "sid");
-      db_query("INSERT INTO {subscription_subscriptions} (sid,uid,object,condition,cid) VALUES (%d,%d,'%s','%s',%d)", $sid, $user->uid, $main_type, serialize($condition), $channel);
+      db_query("INSERT INTO {subscription_subscriptions} (sid,uid,object,`condition`,cid) VALUES (%d,%d,'%s','%s',%d)", $sid, $user->uid, $main_type, serialize($condition), $channel);
       foreach ($merge_ids as $role_id) {
         db_query("DELETE FROM {subscription_subscriptions} WHERE sid=%d", $role_id);  
       }
Index: subscription.mysql
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/subscription/subscription.mysql,v
retrieving revision 1.2
diff -u -F^f -r1.2 subscription.mysql
--- subscription.mysql	30 Aug 2005 07:17:05 -0000	1.2
+++ subscription.mysql	26 Nov 2005 22:54:43 -0000
@@ -28,7 +28,7 @@
 CREATE TABLE subscription_subscriptions (
   sid int(3) unsigned NOT NULL default '0',
   uid int(10) unsigned NOT NULL default '0',
-  condition text NOT NULL,
+  `condition` text NOT NULL,
   cid int(10) unsigned default '0',
   object varchar(15) NOT NULL default '',
   PRIMARY KEY  (sid)