From dca92900fbf0b938ae735883ff9bebfc8342e58c Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sat, 24 Jul 2010 17:28:27 +0000
Subject: - Patch #850152 by kiamlaluno: use 'elseif' in place of 'else if'.

---
 includes/bootstrap.inc         | 2 +-
 includes/common.inc            | 2 +-
 includes/database/database.inc | 2 +-
 includes/path.inc              | 2 +-
 includes/utility.inc           | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'includes')

diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index f5e407f37..3edab924d 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -2181,7 +2181,7 @@ function _drupal_bootstrap_database() {
       if (!isset($value['prefix'])) {
         $current_prefix = '';
       }
-      else if (is_array($value['prefix'])) {
+      elseif (is_array($value['prefix'])) {
         $current_prefix = $value['prefix']['default'];
       }
       else {
diff --git a/includes/common.inc b/includes/common.inc
index b2cccec1e..671e46c16 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -5825,7 +5825,7 @@ function drupal_get_schema_unprocessed($module, $table = NULL) {
   if (!is_null($table) && isset($schema[$table])) {
     return $schema[$table];
   }
-  else if (!empty($schema)) {
+  elseif (!empty($schema)) {
     return $schema;
   }
   return array();
diff --git a/includes/database/database.inc b/includes/database/database.inc
index a75764948..600b5c994 100644
--- a/includes/database/database.inc
+++ b/includes/database/database.inc
@@ -1341,7 +1341,7 @@ abstract class Database {
             'default' => '',
           );
         }
-        else if (!is_array($database_info[$index][$target]['prefix'])) {
+        elseif (!is_array($database_info[$index][$target]['prefix'])) {
           // Transform the flat form into an array form.
           $database_info[$index][$target]['prefix'] = array(
             'default' => $database_info[$index][$target]['prefix'],
diff --git a/includes/path.inc b/includes/path.inc
index b41fa7d74..aa685d607 100644
--- a/includes/path.inc
+++ b/includes/path.inc
@@ -112,7 +112,7 @@ function drupal_lookup_path($action, $path = '', $path_language = NULL) {
         return FALSE;
       }
       // For system paths which were not cached, query aliases individually.
-      else if (!isset($cache['no_aliases'][$path_language][$path])) {
+      elseif (!isset($cache['no_aliases'][$path_language][$path])) {
         // Get the most fitting result falling back with alias without language
         $alias = db_query("SELECT alias FROM {url_alias} WHERE source = :source AND language IN (:language, :language_none) ORDER BY language DESC, pid DESC", array(
           ':source' => $path,
diff --git a/includes/utility.inc b/includes/utility.inc
index 438389d12..8bd78904f 100644
--- a/includes/utility.inc
+++ b/includes/utility.inc
@@ -31,10 +31,10 @@ function drupal_var_export($var, $prefix = '') {
       $output .= ')';
     }
   }
-  else if (is_bool($var)) {
+  elseif (is_bool($var)) {
     $output = $var ? 'TRUE' : 'FALSE';
   }
-  else if (is_string($var)) {
+  elseif (is_string($var)) {
     $line_safe_var = str_replace("\n", '\n', $var);
     if (strpos($var, "\n") !== FALSE || strpos($var, "'") !== FALSE) {
       // If the string contains a line break or a single quote, use the
-- 
cgit v1.2.3