Index: includes/file.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/file.inc,v
retrieving revision 1.168
diff -u -p -r1.168 file.inc
--- includes/file.inc	17 May 2009 10:42:16 -0000	1.168
+++ includes/file.inc	23 May 2009 18:51:41 -0000
@@ -401,7 +401,7 @@ function file_copy($source, $destination
     }
     // If we are renaming around an existing file (rather than a directory),
     // use its basename for the filename.
-    else if ($replace == FILE_EXISTS_RENAME && is_file(file_create_path($destination))) {
+    elseif ($replace == FILE_EXISTS_RENAME && is_file(file_create_path($destination))) {
       $file->filename = basename($destination);
     }
 
@@ -577,7 +577,7 @@ function file_move($source, $destination
     }
     // If we are renaming around an existing file (rather than a directory),
     // use its basename for the filename.
-    else if ($replace == FILE_EXISTS_RENAME && is_file(file_create_path($destination))) {
+    elseif ($replace == FILE_EXISTS_RENAME && is_file(file_create_path($destination))) {
       $file->filename = basename($destination);
     }
 
@@ -1252,7 +1252,7 @@ function file_save_data($data, $destinat
     }
     // If we are renaming around an existing file (rather than a directory),
     // use its basename for the filename.
-    else if ($replace == FILE_EXISTS_RENAME && is_file(file_create_path($destination))) {
+    elseif ($replace == FILE_EXISTS_RENAME && is_file(file_create_path($destination))) {
       $file->filename = basename($destination);
     }
 
Index: includes/path.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/path.inc,v
retrieving revision 1.36
diff -u -p -r1.36 path.inc
--- includes/path.inc	16 May 2009 19:07:02 -0000	1.36
+++ includes/path.inc	23 May 2009 18:51:41 -0000
@@ -94,7 +94,7 @@ function drupal_lookup_path($action, $pa
         return $map[$path_language][$path];
       }
       // For system paths which were not cached, query aliases individually.
-      else if (!isset($no_aliases[$path_language][$path])) {
+      elseif (!isset($no_aliases[$path_language][$path])) {
         // Get the most fitting result falling back with alias without language
         $alias = db_query("SELECT dst FROM {url_alias} WHERE src = :src AND language IN(:language, '') ORDER BY language DESC", array(
           ':src' => $path,
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.711
diff -u -p -r1.711 comment.module
--- modules/comment/comment.module	21 May 2009 10:34:55 -0000	1.711
+++ modules/comment/comment.module	23 May 2009 18:51:44 -0000
@@ -425,7 +425,7 @@ function comment_node_view($node, $tease
         'value' => url('node/' . $node->nid, array('fragment' => 'comments', 'absolute' => TRUE))
       );
     }
-    else if ($teaser) {
+    elseif ($teaser) {
       // Main page: display the number of comments that have been posted.
       if (user_access('access comments')) {
         if (!empty($node->comment_count)) {
Index: modules/simpletest/simpletest.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/simpletest.pages.inc,v
retrieving revision 1.1
diff -u -p -r1.1 simpletest.pages.inc
--- modules/simpletest/simpletest.pages.inc	1 May 2009 13:40:56 -0000	1.1
+++ modules/simpletest/simpletest.pages.inc	23 May 2009 18:51:44 -0000
@@ -320,7 +320,7 @@ function simpletest_result_form_submit($
   if ($form_state['values']['filter'] == 'all') {
     $classes = array_merge($pass, $fail);
   }
-  else if ($form_state['values']['filter'] == 'pass') {
+  elseif ($form_state['values']['filter'] == 'pass') {
     $classes = $pass;
   }
   else {