- Patch #850152 by kiamlaluno: use 'elseif' in place of 'else if'.

10 files changed, 27 insertions, 27 deletions

diff --git a/modules/blog/blog.module b/modules/blog/blog.module
index fd20351b5..89630db5e 100644
--- a/modules/blog/blog.module
+++ b/modules/blog/blog.module
@@ -151,7 +151,7 @@ function blog_menu_local_tasks_alter(&$data, $router_item, $root_path) {
     }
   }
   // Provide a helper action link to the author on the 'blog/%' page.
-  else if ($root_path == 'blog/%' && $router_item['page_arguments'][0]->uid == $user->uid) {
+  elseif ($root_path == 'blog/%' && $router_item['page_arguments'][0]->uid == $user->uid) {
     $data['actions']['output']['blog'] = array(
       '#theme' => 'menu_local_action',
     );
diff --git a/modules/comment/comment.admin.inc b/modules/comment/comment.admin.inc
index eb4a769b8..4682cfa64 100644
--- a/modules/comment/comment.admin.inc
+++ b/modules/comment/comment.admin.inc
@@ -168,7 +168,7 @@ function comment_admin_overview_submit($form, &$form_state) {
       if ($operation == 'unpublish') {
         $comment->status = COMMENT_NOT_PUBLISHED;
       }
-      else if ($operation == 'publish') {
+      elseif ($operation == 'publish') {
         $comment->status = COMMENT_PUBLISHED;
       }
       comment_save($comment);
diff --git a/modules/contextual/contextual.module b/modules/contextual/contextual.module
index ae9000eba..c5b76ceba 100644
--- a/modules/contextual/contextual.module
+++ b/modules/contextual/contextual.module
@@ -78,7 +78,7 @@ function contextual_preprocess(&$variables, $hook) {
     $keys = array_keys($hooks[$hook]['variables']);
     $key = $keys[0];
   }
-  else if (!empty($hooks[$hook]['render element'])) {
+  elseif (!empty($hooks[$hook]['render element'])) {
     $key = $hooks[$hook]['render element'];
   }
   if (!empty($key) && isset($variables[$key])) {
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index 720ee514f..3258b3930 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -761,7 +761,7 @@ function forum_forum_load($tid = NULL) {
     }
   }
   // If $tid is 0, create an empty object to hold the child terms.
-  else if ($tid === 0) {
+  elseif ($tid === 0) {
     $forum_term = (object) array(
       'tid' => 0,
     );
diff --git a/modules/overlay/overlay.module b/modules/overlay/overlay.module
index f65f32d8d..ea0cddf4a 100644
--- a/modules/overlay/overlay.module
+++ b/modules/overlay/overlay.module
@@ -92,7 +92,7 @@ function overlay_init() {
       unset($_GET['render']);
     }
     // Do not enable the overlay if we already are on an admin page.
-    else if (!path_is_admin($current_path)) {
+    elseif (!path_is_admin($current_path)) {
       // Otherwise add overlay parent code and our behavior.
       overlay_set_mode('parent');
     }
diff --git a/modules/simpletest/simpletest.pages.inc b/modules/simpletest/simpletest.pages.inc
index 49bf3ec57..6024ba216 100644
--- a/modules/simpletest/simpletest.pages.inc
+++ b/modules/simpletest/simpletest.pages.inc
@@ -344,7 +344,7 @@ function simpletest_result_form_submit($form, &$form_state) {
   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 {
diff --git a/modules/simpletest/tests/file_test.module b/modules/simpletest/tests/file_test.module
index 78b80f33d..3009c465b 100644
--- a/modules/simpletest/tests/file_test.module
+++ b/modules/simpletest/tests/file_test.module
@@ -113,7 +113,7 @@ function _file_test_form_submit(&$form, &$form_state) {
   if ($form_state['values']['allow_all_extensions']) {
     $validators['file_validate_extensions'] = array();
   }
-  else if (!empty($form_state['values']['extensions'])) {
+  elseif (!empty($form_state['values']['extensions'])) {
     $validators['file_validate_extensions'] = array($form_state['values']['extensions']);
   }
 
diff --git a/modules/simpletest/tests/system_test.module b/modules/simpletest/tests/system_test.module
index 1209015fb..215fc87ee 100644
--- a/modules/simpletest/tests/system_test.module
+++ b/modules/simpletest/tests/system_test.module
@@ -263,11 +263,11 @@ function system_test_page_build(&$page) {
     $page['footer'] = drupal_set_page_content();
     $page['footer']['main']['#markup'] = '<div id="system-test-content">' . $page['footer']['main']['#markup'] . '</div>';
   }
-  else if ($menu_item['path'] == 'system-test/main-content-fallback') {
+  elseif ($menu_item['path'] == 'system-test/main-content-fallback') {
     drupal_set_page_content();
     $main_content_display = FALSE;
   }
-  else if ($menu_item['path'] == 'system-test/main-content-duplication') {
+  elseif ($menu_item['path'] == 'system-test/main-content-duplication') {
     drupal_set_page_content();
   }
 }
diff --git a/modules/system/system.tar.inc b/modules/system/system.tar.inc
index 28a2e63ca..7dbe159ef 100644
--- a/modules/system/system.tar.inc
+++ b/modules/system/system.tar.inc
@@ -146,7 +146,7 @@ class Archive_Tar
         if ($this->_compress) { // assert zlib or bz2 extension support
             if ($this->_compress_type == 'gz')
                 $extname = 'zlib';
-            else if ($this->_compress_type == 'bz2')
+            elseif ($this->_compress_type == 'bz2')
                 $extname = 'bz2';
 
             if (!extension_loaded($extname)) {
@@ -650,9 +650,9 @@ class Archive_Tar
     {
         if ($this->_compress_type == 'gz')
             $this->_file = @gzopen($this->_tarname, "wb9");
-        else if ($this->_compress_type == 'bz2')
+        elseif ($this->_compress_type == 'bz2')
             $this->_file = @bzopen($this->_tarname, "w");
-        else if ($this->_compress_type == 'none')
+        elseif ($this->_compress_type == 'none')
             $this->_file = @fopen($this->_tarname, "wb");
         else
             $this->_error('Unknown or missing compression type ('
@@ -703,9 +703,9 @@ class Archive_Tar
 
         if ($this->_compress_type == 'gz')
             $this->_file = @gzopen($v_filename, "rb");
-        else if ($this->_compress_type == 'bz2')
+        elseif ($this->_compress_type == 'bz2')
             $this->_file = @bzopen($v_filename, "r");
-        else if ($this->_compress_type == 'none')
+        elseif ($this->_compress_type == 'none')
             $this->_file = @fopen($v_filename, "rb");
         else
             $this->_error('Unknown or missing compression type ('
@@ -752,9 +752,9 @@ class Archive_Tar
         if (is_resource($this->_file)) {
             if ($this->_compress_type == 'gz')
                 @gzclose($this->_file);
-            else if ($this->_compress_type == 'bz2')
+            elseif ($this->_compress_type == 'bz2')
                 @bzclose($this->_file);
-            else if ($this->_compress_type == 'none')
+            elseif ($this->_compress_type == 'none')
                 @fclose($this->_file);
             else
                 $this->_error('Unknown or missing compression type ('
@@ -801,9 +801,9 @@ class Archive_Tar
           if ($p_len === null) {
               if ($this->_compress_type == 'gz')
                   @gzputs($this->_file, $p_binary_data);
-              else if ($this->_compress_type == 'bz2')
+              elseif ($this->_compress_type == 'bz2')
                   @bzwrite($this->_file, $p_binary_data);
-              else if ($this->_compress_type == 'none')
+              elseif ($this->_compress_type == 'none')
                   @fputs($this->_file, $p_binary_data);
               else
                   $this->_error('Unknown or missing compression type ('
@@ -811,9 +811,9 @@ class Archive_Tar
           } else {
               if ($this->_compress_type == 'gz')
                   @gzputs($this->_file, $p_binary_data, $p_len);
-              else if ($this->_compress_type == 'bz2')
+              elseif ($this->_compress_type == 'bz2')
                   @bzwrite($this->_file, $p_binary_data, $p_len);
-              else if ($this->_compress_type == 'none')
+              elseif ($this->_compress_type == 'none')
                   @fputs($this->_file, $p_binary_data, $p_len);
               else
                   $this->_error('Unknown or missing compression type ('
@@ -832,9 +832,9 @@ class Archive_Tar
       if (is_resource($this->_file)) {
           if ($this->_compress_type == 'gz')
               $v_block = @gzread($this->_file, 512);
-          else if ($this->_compress_type == 'bz2')
+          elseif ($this->_compress_type == 'bz2')
               $v_block = @bzread($this->_file, 512);
-          else if ($this->_compress_type == 'none')
+          elseif ($this->_compress_type == 'none')
               $v_block = @fread($this->_file, 512);
           else
               $this->_error('Unknown or missing compression type ('
@@ -854,11 +854,11 @@ class Archive_Tar
           if ($this->_compress_type == 'gz') {
               @gzseek($this->_file, gztell($this->_file)+($p_len*512));
           }
-          else if ($this->_compress_type == 'bz2') {
+          elseif ($this->_compress_type == 'bz2') {
               // ----- Replace missing bztell() and bzseek()
               for ($i=0; $i<$p_len; $i++)
                   $this->_readBlock();
-          } else if ($this->_compress_type == 'none')
+          } elseif ($this->_compress_type == 'none')
               @fseek($this->_file, ftell($this->_file)+($p_len*512));
           else
               $this->_error('Unknown or missing compression type ('
@@ -1834,11 +1834,11 @@ class Archive_Tar
                     // ----- Ignore this directory
                     // Should be the first $i=0, but no check is done
                 }
-                else if ($v_list[$i] == "..") {
+                elseif ($v_list[$i] == "..") {
                     // ----- Ignore it and ignore the $i-1
                     $i--;
                 }
-                else if (   ($v_list[$i] == '')
+                elseif (   ($v_list[$i] == '')
 				         && ($i!=(sizeof($v_list)-1))
 						 && ($i!=0)) {
                     // ----- Ignore only the double '//' in path,
diff --git a/modules/user/user.module b/modules/user/user.module
index 051ca0428..d5f97c99e 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -3201,7 +3201,7 @@ function user_build_filter_query(SelectQuery $query) {
       $permission_alias = $query->join('role_permission', 'p', $user_role_alias . '.rid = %alias.rid');
       $query->condition($permission_alias . '.permission', $value);
     }
-    else if ($key == 'role') {
+    elseif ($key == 'role') {
       $user_roles_alias = $query->join('users_roles', 'ur', '%alias.uid = u.uid');
       $query->condition($user_role_alias . '.rid' , $value);
     }