? common.test_0.patch
? l_class_test.patch
? l_class_test_2.patch
? menu_set_item_3.patch
? menu_set_item_4.patch
? menu_set_item_4.patch.1
? menu_set_item_5.patch
? strstr_to_strpos_1.patch
? strstr_to_strpos_2.patch
? user_theme.patch
? modules/simpletest/tests/common.info
? modules/simpletest/tests/common.module
? modules/simpletest/tests/l_class_test.patch
? modules/upload/upload_12-24-08.patch
? sites/default/files
? sites/default/settings.php
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.677
diff -u -p -r1.677 comment.module
--- modules/comment/comment.module	31 Dec 2008 12:04:36 -0000	1.677
+++ modules/comment/comment.module	31 Dec 2008 13:06:35 -0000
@@ -2151,7 +2151,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)
@@ -2175,4 +2175,4 @@ function comment_ranking() {
       'arguments' => array(variable_get('node_cron_comments_scale', 0)),
     ),
   );
-}
\ No newline at end of file
+}
Index: modules/filter/filter.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.admin.inc,v
retrieving revision 1.19
diff -u -p -r1.19 filter.admin.inc
--- modules/filter/filter.admin.inc	3 Dec 2008 19:43:21 -0000	1.19
+++ modules/filter/filter.admin.inc	31 Dec 2008 13:06:36 -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,");
     $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.1008
diff -u -p -r1.1008 node.module
--- modules/node/node.module	31 Dec 2008 12:02:22 -0000	1.1008
+++ modules/node/node.module	31 Dec 2008 13:06:41 -0000
@@ -2930,7 +2930,7 @@ function node_unpublish_by_keyword_actio
  */
 function node_unpublish_by_keyword_action($node, $context) {
   foreach ($context['keywords'] as $keyword) {
-    if (strstr(node_view(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.8
diff -u -p -r1.8 system.api.php
--- modules/system/system.api.php	31 Dec 2008 11:08:47 -0000	1.8
+++ modules/system/system.api.php	31 Dec 2008 13:06:44 -0000
@@ -378,7 +378,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']);
     }