Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.689
diff -u -p -r1.689 comment.module
--- modules/comment/comment.module	28 Jan 2009 07:43:26 -0000	1.689
+++ modules/comment/comment.module	29 Jan 2009 20:42:36 -0000
@@ -2169,7 +2169,7 @@ function comment_unpublish_by_keyword_ac
  */
 function comment_unpublish_by_keyword_action($comment, $context) {
   foreach ($context['keywords'] as $keyword) {
-    if (strstr($comment->comment, $keyword) || strstr($comment->subject, $keyword)) {
+    if (strpos($comment->comment, $keyword) !== FALSE || strpos($comment->subject, $keyword) !== FALSE) {
       db_update('comment')
         ->fields(array('status' => COMMENT_NOT_PUBLISHED,))
         ->condition('cid', $comment->cid)
Index: modules/filter/filter.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.admin.inc,v
retrieving revision 1.22
diff -u -p -r1.22 filter.admin.inc
--- modules/filter/filter.admin.inc	21 Jan 2009 16:58:42 -0000	1.22
+++ modules/filter/filter.admin.inc	29 Jan 2009 20:42:45 -0000
@@ -24,7 +24,7 @@ function filter_admin_overview() {
     $roles = array();
     foreach (user_roles() as $rid => $name) {
       // Prepare a roles array with roles that may access the filter.
-      if (strstr($format->roles, ",$rid,")) {
+      if (strpos($format->roles, ",$rid,") !== FALSE) {
         $roles[] = $name;
       }
     }
@@ -129,7 +129,7 @@ function filter_admin_format_form(&$form
   );
 
   foreach (user_roles() as $rid => $name) {
-    $checked = strstr($format->roles, ",$rid,");
+    $checked = strpos($format->roles, ",$rid,") !== FALSE;
     $form['roles'][$rid] = array('#type' => 'checkbox',
       '#title' => $name,
       '#default_value' => ($default || $checked),
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1020
diff -u -p -r1.1020 node.module
--- modules/node/node.module	28 Jan 2009 07:34:30 -0000	1.1020
+++ modules/node/node.module	29 Jan 2009 20:44:40 -0000
@@ -3019,7 +3019,7 @@ function node_unpublish_by_keyword_actio
  */
 function node_unpublish_by_keyword_action($node, $context) {
   foreach ($context['keywords'] as $keyword) {
-    if (strstr(drupal_render(node_build(clone $node)), $keyword) || strstr($node->title, $keyword)) {
+    if (strpos(node_view(clone $node), $keyword) !== FALSE || strpos($node->title, $keyword) !== FALSE) {
       $node->status = 0;
       watchdog('action', 'Set @type %title to unpublished.', array('@type' => node_get_types('name', $node), '%title' => $node->title));
       break;
Index: modules/system/system.api.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.api.php,v
retrieving revision 1.16
diff -u -p -r1.16 system.api.php
--- modules/system/system.api.php	29 Jan 2009 14:37:40 -0000	1.16
+++ modules/system/system.api.php	29 Jan 2009 20:45:33 -0000
@@ -435,7 +435,7 @@ function hook_link($type, $object, $teas
  */
 function hook_link_alter(array &$links, $node) {
   foreach ($links as $module => $link) {
-    if (strstr($module, 'taxonomy_term')) {
+    if (strpos($module, 'taxonomy_term') !== FALSE) {
       // Link back to the forum and not the taxonomy term page
       $links[$module]['href'] = str_replace('taxonomy/term', 'forum', $link['href']);
     }