Index: cmf.module
===================================================================
--- cmf.module	(revision 34673)
+++ cmf.module	(working copy)
@@ -534,7 +534,7 @@
 function cmf_users_submit($form, &$form_state) {
   $name = $form_state['values']['users'];
   // Get uid to put in 'user' filter value.
-  $form_state['values']['user'] = db_result(db_query('SELECT uid FROM {users} WHERE name = "%s"', $name));
+  $form_state['values']['user'] = db_result(db_query(db_rewrite_sql('SELECT uid FROM {users} WHERE name = "%s"'), $name));
   // Switch filter type to user.
   $form_state['values']['filter'] = 'user';
   return $name;
@@ -722,7 +722,7 @@
 
   switch ($kind) {
     case 'node':
-      return pager_query('SELECT n.nid, n.title, n.type, n.status, n.created, '
+      return pager_query(db_rewrite_sql('SELECT n.nid, n.title, n.type, n.status, n.created, '
         .'n.changed, n.promote, n.sticky, n.moderate, n.language, '
         .'u.name AS username, u.uid, r.body '
         .'FROM {node} n '
@@ -730,27 +730,27 @@
         .'INNER JOIN {users} u ON n.uid = u.uid '
         . $filter['join']
         . $where
-        . tablesort_sql($header),
+        . tablesort_sql($header)),
         isset($_SESSION['cmf_max_rows']) ? $_SESSION['cmf_max_rows'] : 50, 0, NULL, $filter['args']
         );
       break;
 
     case 'comment':
-      return pager_query('SELECT c.cid, c.subject, c.nid, c.comment, c.timestamp AS created, '
+      return pager_query(db_rewrite_sql('SELECT c.cid, c.subject, c.nid, c.comment, c.timestamp AS created, '
         .'c.status, c.name, c.homepage, u.name AS username, u.uid, n.type, c.comment AS body '
         .'FROM {comments} c '
         .'INNER JOIN {node} n ON c.nid = n.nid '
         .'INNER JOIN {users} u ON u.uid = c.uid '
         . $filter['join']
         . $cwhere
-        . tablesort_sql($header),
+        . tablesort_sql($header)),
         isset($_SESSION['cmf_max_rows']) ? $_SESSION['cmf_max_rows'] : 50, 0, NULL, $filter['args']
       );
       break;
 
     case 'both':
       $args = array_merge($filter['args'], $filter['args']);
-      $count_query = 'SELECT ('
+      $count_query = db_rewrite_sql('SELECT ('
         .'SELECT COUNT(*) FROM {node} n '
         .'JOIN {node_revisions} r ON r.vid = n.vid '
         .'INNER JOIN {users} u ON n.uid = u.uid '
@@ -761,8 +761,8 @@
         .'INNER JOIN {users} u ON u.uid = c.uid '
         . $filter['join']
         . $cwhere
-        .') AS count';
-      return pager_query('SELECT 0 AS cid, n.nid, n.title, NULL AS comment, n.type, n.status, n.created, '
+        .') AS count');
+      return pager_query(db_rewrite_sql('SELECT 0 AS cid, n.nid, n.title, NULL AS comment, n.type, n.status, n.created, '
         .'n.changed, n.promote, n.sticky, n.moderate, n.language, '
         .'u.name AS username, u.uid, r.body '
         .'FROM {node} n '
@@ -776,7 +776,7 @@
         .' FROM {comments} c INNER JOIN {node} n ON c.nid = n.nid INNER JOIN {users} u ON u.uid = c.uid '
         . $filter['join']
         . $cwhere
-        . tablesort_sql($header),
+        . tablesort_sql($header)),
         isset($_SESSION['cmf_max_rows']) ? $_SESSION['cmf_max_rows'] : 50, 0, $count_query, $args
       );
       break;
@@ -802,7 +802,7 @@
 function cmf_get_users($op) {
   switch ($op) {
     case 'names':
-      $result = db_query('SELECT uid, name FROM {users} WHERE uid <> 0 ORDER BY name');
+      $result = db_query(db_rewrite_sql('SELECT uid, name FROM {users} WHERE uid <> 0 ORDER BY name'));
       break;
   }
 
@@ -821,7 +821,7 @@
 function _cmf_user_autocomplete($string = '') {
   $matches = array();
   if ($string) {
-    $result = db_query("SELECT name FROM {users} WHERE LOWER(name) LIKE LOWER('%s%%')", $string);
+    $result = db_query(db_rewrite_sql("SELECT name FROM {users} WHERE LOWER(name) LIKE LOWER('%s%%')", $string));
     while ($account = db_fetch_object($result)) {
       $matches[$account->name] = check_plain($account->name);
     }
@@ -839,7 +839,7 @@
 function cmf_get_roles($op) {
   switch ($op) {
     case 'names':
-      $result = db_query('SELECT rid, name FROM {role} ORDER BY name');
+      $result = db_query(db_rewrite_sql('SELECT rid, name FROM {role} ORDER BY name'));
       break;
   }
   $roles = array();
@@ -876,7 +876,7 @@
  * @return formated (node) type
  */
 function theme_cmf_type($type) {
-  return db_result(db_query('SELECT name FROM {node_type} WHERE type = "%s"', $type));
+  return db_result(db_query(db_rewrite_sql('SELECT name FROM {node_type} WHERE type = "%s"', $type)));
 }
 
 /**
@@ -922,7 +922,7 @@
   if ($uid == 0) {
     return variable_get('anonymous', t('anonymous'));
   }
-  $result = db_query('SELECT name, status FROM {users} WHERE uid = %d', $uid);
+  $result = db_query(db_rewrite_sql('SELECT name, status FROM {users} WHERE uid = %d', $uid));
   $user = db_fetch_array($result);
   $url_alias = _cmf_get_user_path($uid);
 
@@ -943,12 +943,12 @@
  * @return the relative URL of the user profile
  */
 function _cmf_get_user_path($uid) {
-  return db_result(db_query("
+  return db_result(db_query(db_rewrite_sql("
     SELECT dst
     FROM {url_alias}
     WHERE src = '%s';",
     'user/'. $uid
-  ));
+  )));
 }
 
 /**