diff --git a/core/authorize.php b/core/authorize.php index c6ba51d..e3eebc8 100644 --- a/core/authorize.php +++ b/core/authorize.php @@ -152,14 +152,14 @@ if (authorize_access_allowed()) { $output .= theme('item_list', array('items' => $links, 'title' => t('Next steps'))); } // If a batch is running, let it run. - elseif (isset($_GET['batch'])) { + else if (isset($_GET['batch'])) { $output = _batch_page(); } else { if (empty($_SESSION['authorize_operation']) || empty($_SESSION['authorize_filetransfer_info'])) { $output = t('It appears you have reached this page in error.'); } - elseif (!$batch = batch_get()) { + else if (!$batch = batch_get()) { // We have a batch to process, show the filetransfer form. $elements = drupal_get_form('authorize_filetransfer_form'); $output = drupal_render($elements); diff --git a/core/cron.php b/core/cron.php index fa9aa14..606a89f 100644 --- a/core/cron.php +++ b/core/cron.php @@ -20,7 +20,7 @@ if (!isset($_GET['cron_key']) || variable_get('cron_key', 'drupal') != $_GET['cr watchdog('cron', 'Cron could not run because an invalid key was used.', array(), WATCHDOG_NOTICE); drupal_access_denied(); } -elseif (variable_get('maintenance_mode', 0)) { +else if (variable_get('maintenance_mode', 0)) { watchdog('cron', 'Cron could not run because the site is in maintenance mode.', array(), WATCHDOG_NOTICE); drupal_access_denied(); } diff --git a/core/includes/actions.inc b/core/includes/actions.inc index 75cda42..f028900 100644 --- a/core/includes/actions.inc +++ b/core/includes/actions.inc @@ -70,7 +70,7 @@ function actions_do($action_ids, $object = NULL, $context = NULL, $a1 = NULL, $a if (is_numeric($action_id)) { $conditions[] = $action_id; } - elseif (isset($available_actions[$action_id])) { + else if (isset($available_actions[$action_id])) { $actions[$action_id] = $available_actions[$action_id]; } } diff --git a/core/includes/ajax.inc b/core/includes/ajax.inc index 8817356..681f090 100644 --- a/core/includes/ajax.inc +++ b/core/includes/ajax.inc @@ -504,7 +504,7 @@ function ajax_prepare_response($page_callback_result) { // Simply delivering an empty commands array is sufficient. This results // in the Ajax request being completed, but nothing being done to the page. } - elseif (is_int($page_callback_result)) { + else if (is_int($page_callback_result)) { switch ($page_callback_result) { case MENU_NOT_FOUND: $commands[] = ajax_command_alert(t('The requested page could not be found.')); @@ -520,7 +520,7 @@ function ajax_prepare_response($page_callback_result) { break; } } - elseif (is_array($page_callback_result) && isset($page_callback_result['#type']) && ($page_callback_result['#type'] == 'ajax')) { + else if (is_array($page_callback_result) && isset($page_callback_result['#type']) && ($page_callback_result['#type'] == 'ajax')) { // Complex Ajax callbacks can return a result that contains an error message // or a specific set of commands to send to the browser. $page_callback_result += element_info('ajax'); @@ -716,7 +716,7 @@ function ajax_pre_render_element($element) { } unset($settings['trigger_as']); } - elseif (isset($element['#name'])) { + else if (isset($element['#name'])) { // Most of the time, elements can submit as themselves, in which case the // 'trigger_as' key isn't needed, and the element's name is used. $settings['submit']['_triggering_element_name'] = $element['#name']; diff --git a/core/includes/authorize.inc b/core/includes/authorize.inc index 21e9a11..101f739 100644 --- a/core/includes/authorize.inc +++ b/core/includes/authorize.inc @@ -44,7 +44,7 @@ function authorize_filetransfer_form($form, &$form_state) { if (isset($form_state['values']['connection_settings']['authorize_filetransfer_default'])) { $authorize_filetransfer_default = $form_state['values']['connection_settings']['authorize_filetransfer_default']; } - elseif ($authorize_filetransfer_default = variable_get('authorize_filetransfer_default', NULL)); + else if ($authorize_filetransfer_default = variable_get('authorize_filetransfer_default', NULL)); else { $authorize_filetransfer_default = key($available_backends); } @@ -254,7 +254,7 @@ function authorize_filetransfer_form_submit($form, &$form_state) { } } // The attribute is defined, so only save if set to TRUE. - elseif ($form['connection_settings'][$filetransfer_backend][$key]['#filetransfer_save']) { + else if ($form['connection_settings'][$filetransfer_backend][$key]['#filetransfer_save']) { $connection_settings[$key] = $value; } } diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index c26ec86..4c3d651 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -731,7 +731,7 @@ function drupal_get_filename($type, $name, $filename = NULL) { if (!empty($filename) && file_exists($filename)) { $files[$type][$name] = $filename; } - elseif (isset($files[$type][$name])) { + else if (isset($files[$type][$name])) { // nothing } // Verify that we have an active database connection, before querying @@ -761,7 +761,7 @@ function drupal_get_filename($type, $name, $filename = NULL) { $dir = 'themes/engines'; $extension = 'engine'; } - elseif ($type == 'theme') { + else if ($type == 'theme') { $extension = 'info'; } else { @@ -1033,7 +1033,7 @@ function drupal_add_http_header($name, $value, $append = FALSE) { if ($value === FALSE) { $headers[$name_lower] = FALSE; } - elseif (isset($headers[$name_lower]) && $append) { + else if (isset($headers[$name_lower]) && $append) { // Multiple headers with identical names may be combined using comma (RFC // 2616, section 4.2). $headers[$name_lower] .= ',' . $value; @@ -1113,7 +1113,7 @@ function drupal_send_headers($default_headers = array(), $only_default = FALSE) header($_SERVER['SERVER_PROTOCOL'] . ' ' . $value); } // Skip headers that have been unset. - elseif ($value) { + else if ($value) { header($header_names[$name_lower] . ': ' . $value); } } @@ -1375,7 +1375,7 @@ function t($string, array $args = array(), array $options = array()) { $string = $custom_strings[$options['langcode']][$options['context']][$string]; } // Translate with locale module if enabled. - elseif ($options['langcode'] != LANGUAGE_SYSTEM && ($options['langcode'] != 'en' || variable_get('locale_translate_english', FALSE)) && function_exists('locale')) { + else if ($options['langcode'] != LANGUAGE_SYSTEM && ($options['langcode'] != 'en' || variable_get('locale_translate_english', FALSE)) && function_exists('locale')) { $string = locale($string, $options['context'], $options['langcode']); } if (empty($args)) { @@ -1496,7 +1496,7 @@ function request_uri() { if (isset($_SERVER['argv'])) { $uri = $_SERVER['SCRIPT_NAME'] . '?' . $_SERVER['argv'][0]; } - elseif (isset($_SERVER['QUERY_STRING'])) { + else if (isset($_SERVER['QUERY_STRING'])) { $uri = $_SERVER['SCRIPT_NAME'] . '?' . $_SERVER['QUERY_STRING']; } else { @@ -1755,7 +1755,7 @@ function drupal_is_denied($ip) { // won't be denied. However the user asked explicitly not to use the // database and also in this case it's quite likely that the user relies // on higher performance solutions like a firewall. - elseif (class_exists('Database', FALSE)) { + else if (class_exists('Database', FALSE)) { $denied = (bool)db_query("SELECT 1 FROM {blocked_ips} WHERE ip = :ip", array(':ip' => $ip))->fetchField(); } return $denied; @@ -1817,7 +1817,7 @@ function drupal_random_bytes($count) { } // openssl_random_pseudo_bytes() will find entropy in a system-dependent // way. - elseif ($php_compatible && function_exists('openssl_random_pseudo_bytes')) { + else if ($php_compatible && function_exists('openssl_random_pseudo_bytes')) { $bytes .= openssl_random_pseudo_bytes($count - strlen($bytes)); } // If /dev/urandom is not available or returns no bytes, this loop will @@ -1932,7 +1932,7 @@ function drupal_array_merge_deep_array($arrays) { $result[] = $value; } // Recurse when both values are arrays. - elseif (isset($result[$key]) && is_array($result[$key]) && is_array($value)) { + else if (isset($result[$key]) && is_array($result[$key]) && is_array($value)) { $result[$key] = drupal_array_merge_deep_array(array($result[$key], $value)); } // Otherwise, use the latter value, overriding any previous value. @@ -2233,7 +2233,7 @@ function _drupal_bootstrap_database() { if (!isset($value['prefix'])) { $current_prefix = ''; } - elseif (is_array($value['prefix'])) { + else if (is_array($value['prefix'])) { $current_prefix = $value['prefix']['default']; } else { @@ -2623,7 +2623,7 @@ function request_path() { // $path and returned in later calls. $path = $_GET['q']; } - elseif (isset($_SERVER['REQUEST_URI'])) { + else if (isset($_SERVER['REQUEST_URI'])) { // This request is either a clean URL, or 'index.php', or nonsense. // Extract the path from REQUEST_URI. $request_path = strtok($_SERVER['REQUEST_URI'], '?'); diff --git a/core/includes/common.inc b/core/includes/common.inc index 70395ba..266b4d5 100644 --- a/core/includes/common.inc +++ b/core/includes/common.inc @@ -413,7 +413,7 @@ function drupal_get_query_parameters(array $query = NULL, array $exclude = array if (empty($exclude)) { return $query; } - elseif (!$parent) { + else if (!$parent) { $exclude = array_flip($exclude); } @@ -484,7 +484,7 @@ function drupal_http_build_query(array $query, $parent = '') { $params[] = drupal_http_build_query($value, $key); } // If a query parameter value is NULL, only append its key. - elseif (!isset($value)) { + else if (!isset($value)) { $params[] = $key; } else { @@ -1009,7 +1009,7 @@ function drupal_http_request($url, array $options = array()) { $result->code = HTTP_REQUEST_TIMEOUT; $result->error = 'request timed out'; } - elseif ($options['max_redirects']) { + else if ($options['max_redirects']) { // Redirect to the new location. $options['max_redirects']--; $result = drupal_http_request($location, $options); @@ -1415,7 +1415,7 @@ function _filter_xss_split($m, $store = FALSE) { // We matched a lone ">" character. return '>'; } - elseif (strlen($string) == 1) { + else if (strlen($string) == 1) { // We matched a lone "<" character. return '<'; } @@ -2158,7 +2158,7 @@ function url($path = NULL, array $options = array()) { if ($options['https'] === TRUE) { $path = str_replace('http://', 'https://', $path); } - elseif ($options['https'] === FALSE) { + else if ($options['https'] === FALSE) { $path = str_replace('https://', 'http://', $path); } } @@ -2175,7 +2175,7 @@ function url($path = NULL, array $options = array()) { $options['base_url'] = $base_secure_url; $options['absolute'] = TRUE; } - elseif ($options['https'] === FALSE) { + else if ($options['https'] === FALSE) { $options['base_url'] = $base_insecure_url; $options['absolute'] = TRUE; } @@ -2189,7 +2189,7 @@ function url($path = NULL, array $options = array()) { if ($path == '') { $path = ''; } - elseif (!empty($path) && !$options['alias']) { + else if (!empty($path) && !$options['alias']) { $langcode = isset($options['language']) && isset($options['language']->langcode) ? $options['language']->langcode : ''; $alias = drupal_get_path_alias($original_path, $langcode); if ($alias != $original_path) { @@ -2597,7 +2597,7 @@ function drupal_deliver_html_page($page_callback_result) { break; } } - elseif (isset($page_callback_result)) { + else if (isset($page_callback_result)) { // Print anything besides a menu constant, assuming it's not NULL or // undefined. print drupal_render_page($page_callback_result); @@ -3057,24 +3057,24 @@ function drupal_sort_css_js($a, $b) { if ($a['group'] < $b['group']) { return -1; } - elseif ($a['group'] > $b['group']) { + else if ($a['group'] > $b['group']) { return 1; } // Within a group, order all infrequently needed, page-specific files after // common files needed throughout the website. Separating this way allows for // the aggregate file generated for all of the common files to be reused // across a site visit without being cut by a page using a less common file. - elseif ($a['every_page'] && !$b['every_page']) { + else if ($a['every_page'] && !$b['every_page']) { return -1; } - elseif (!$a['every_page'] && $b['every_page']) { + else if (!$a['every_page'] && $b['every_page']) { return 1; } // Finally, order by weight. - elseif ($a['weight'] < $b['weight']) { + else if ($a['weight'] < $b['weight']) { return -1; } - elseif ($a['weight'] > $b['weight']) { + else if ($a['weight'] > $b['weight']) { return 1; } else { @@ -3351,7 +3351,7 @@ function drupal_pre_render_styles($elements) { } // The group can be aggregated, but hasn't been: combine multiple items // into as few STYLE tags as possible. - elseif ($group['preprocess']) { + else if ($group['preprocess']) { $import = array(); foreach ($group['items'] as $item) { // A theme's .info file may have an entry for a file that doesn't @@ -5529,7 +5529,7 @@ function drupal_pre_render_conditional_comments($elements) { if ($browsers['IE'] === TRUE) { $expression = 'IE'; } - elseif ($browsers['IE'] === FALSE) { + else if ($browsers['IE'] === FALSE) { $expression = '!IE'; } else { @@ -5591,7 +5591,7 @@ function drupal_pre_render_link($element) { if (isset($element['#options']['attributes']['id'])) { $element['#id'] = $element['#options']['attributes']['id']; } - elseif (isset($element['#id'])) { + else if (isset($element['#id'])) { $element['#options']['attributes']['id'] = $element['#id']; } @@ -6248,7 +6248,7 @@ function drupal_render_cid_parts($granularity = NULL) { if ($granularity & DRUPAL_CACHE_PER_ROLE) { $cid_parts[] = 'r.' . implode(',', array_keys($user->roles)); } - elseif ($granularity & DRUPAL_CACHE_PER_USER) { + else if ($granularity & DRUPAL_CACHE_PER_USER) { $cid_parts[] = "u.$user->uid"; } @@ -6277,7 +6277,7 @@ function drupal_render_cid_create($elements) { if (isset($elements['#cache']['cid'])) { return $elements['#cache']['cid']; } - elseif (isset($elements['#cache']['keys'])) { + else if (isset($elements['#cache']['keys'])) { $granularity = isset($elements['#cache']['granularity']) ? $elements['#cache']['granularity'] : NULL; // Merge in additional cache ID parts based provided by drupal_render_cid_parts(). $cid_parts = array_merge($elements['#cache']['keys'], drupal_render_cid_parts($granularity)); @@ -6464,7 +6464,7 @@ function element_children(&$elements, $sort = FALSE) { } // Only trigger an error if the value is not null. // @see http://drupal.org/node/1283892 - elseif (isset($value)) { + else if (isset($value)) { trigger_error(t('"@key" is an invalid render array key', array('@key' => $key)), E_USER_ERROR); } } @@ -7645,7 +7645,7 @@ function queue($name, $reliable = FALSE) { if ($class && $reliable && in_array('Drupal\Core\Queue\ReliableQueueInterface', class_implements($class))) { $class = variable_get('queue_default_reliable_class', 'Drupal\Core\Queue\System'); } - elseif (!$class) { + else if (!$class) { $class = variable_get('queue_default_class', 'Drupal\Core\Queue\System'); } $queues[$name] = new $class($name); diff --git a/core/includes/file.inc b/core/includes/file.inc index eaff634..1e78b29 100644 --- a/core/includes/file.inc +++ b/core/includes/file.inc @@ -461,7 +461,7 @@ function file_create_url($uri) { return $GLOBALS['base_url'] . '/' . drupal_encode_path($uri); } } - elseif ($scheme == 'http' || $scheme == 'https') { + else if ($scheme == 'http' || $scheme == 'https') { // Check for http so that we don't have to implement getExternalUrl() for // the http wrapper. return $uri; @@ -851,7 +851,7 @@ function file_copy(stdClass $source, $destination = NULL, $replace = FILE_EXISTS } // If we are renaming around an existing file (rather than a directory), // use its basename for the filename. - elseif ($replace == FILE_EXISTS_RENAME && is_file($destination)) { + else if ($replace == FILE_EXISTS_RENAME && is_file($destination)) { $file->filename = drupal_basename($destination); } @@ -1100,7 +1100,7 @@ function file_move(stdClass $source, $destination = NULL, $replace = FILE_EXISTS } // If we are renaming around an existing file (rather than a directory), // use its basename for the filename. - elseif ($replace == FILE_EXISTS_RENAME && is_file($destination)) { + else if ($replace == FILE_EXISTS_RENAME && is_file($destination)) { $file->filename = drupal_basename($destination); } @@ -1937,7 +1937,7 @@ function file_save_data($data, $destination = NULL, $replace = FILE_EXISTS_RENAM } // If we are renaming around an existing file (rather than a directory), // use its basename for the filename. - elseif ($replace == FILE_EXISTS_RENAME && is_file($destination)) { + else if ($replace == FILE_EXISTS_RENAME && is_file($destination)) { $file->filename = drupal_basename($destination); } @@ -2115,7 +2115,7 @@ function file_scan_directory($dir, $mask, $options = array(), $depth = 0) { // Give priority to files in this folder by merging them in after any subdirectory files. $files = array_merge(file_scan_directory($uri, $mask, $options, $depth + 1), $files); } - elseif ($depth >= $options['min_depth'] && preg_match($mask, $filename)) { + else if ($depth >= $options['min_depth'] && preg_match($mask, $filename)) { // Always use this match over anything already set in $files with the // same $$options['key']. $file = new stdClass(); diff --git a/core/includes/filetransfer/local.inc b/core/includes/filetransfer/local.inc index b125989..bc607b8 100644 --- a/core/includes/filetransfer/local.inc +++ b/core/includes/filetransfer/local.inc @@ -36,7 +36,7 @@ class FileTransferLocal extends FileTransfer implements FileTransferChmodInterfa throw new FileTransferException('Cannot remove directory %directory.', NULL, array('%directory' => $filename)); } } - elseif ($file->isFile()) { + else if ($file->isFile()) { if (@!drupal_unlink($filename)) { throw new FileTransferException('Cannot remove file %file.', NULL, array('%file' => $filename)); } @@ -69,7 +69,7 @@ class FileTransferLocal extends FileTransfer implements FileTransferChmodInterfa } } } - elseif (@!chmod($path, $mode)) { + else if (@!chmod($path, $mode)) { throw new FileTransferException('Cannot chmod %path.', NULL, array('%path' => $path)); } } diff --git a/core/includes/form.inc b/core/includes/form.inc index 65c462a..607f73e 100644 --- a/core/includes/form.inc +++ b/core/includes/form.inc @@ -511,7 +511,7 @@ function form_get_cache($form_build_id, &$form_state) { $file += array('type' => 'inc', 'name' => $file['module']); module_load_include($file['type'], $file['module'], $file['name']); } - elseif (file_exists($file)) { + else if (file_exists($file)) { require_once DRUPAL_ROOT . '/' . $file; } } @@ -1037,7 +1037,7 @@ function drupal_prepare_form($form_id, &$form, &$form_state) { } // Otherwise check whether this is a shared form and whether there is a // handler for the shared $form_id. - elseif (isset($form_state['build_info']['base_form_id']) && function_exists($form_state['build_info']['base_form_id'] . '_validate')) { + else if (isset($form_state['build_info']['base_form_id']) && function_exists($form_state['build_info']['base_form_id'] . '_validate')) { $form['#validate'][] = $form_state['build_info']['base_form_id'] . '_validate'; } } @@ -1051,7 +1051,7 @@ function drupal_prepare_form($form_id, &$form, &$form_state) { } // Otherwise check whether this is a shared form and whether there is a // handler for the shared $form_id. - elseif (isset($form_state['build_info']['base_form_id']) && function_exists($form_state['build_info']['base_form_id'] . '_submit')) { + else if (isset($form_state['build_info']['base_form_id']) && function_exists($form_state['build_info']['base_form_id'] . '_submit')) { $form['#submit'][] = $form_state['build_info']['base_form_id'] . '_submit'; } } @@ -1320,11 +1320,11 @@ function _form_validate(&$elements, &$form_state, $form_id = NULL) { // identical to the empty option's value, we reset the element's value // to NULL to trigger the regular #required handling below. // @see form_process_select() - elseif ($elements['#type'] == 'select' && !$elements['#multiple'] && $elements['#required'] && !isset($elements['#default_value']) && $elements['#value'] === $elements['#empty_value']) { + else if ($elements['#type'] == 'select' && !$elements['#multiple'] && $elements['#required'] && !isset($elements['#default_value']) && $elements['#value'] === $elements['#empty_value']) { $elements['#value'] = NULL; form_set_value($elements, NULL, $form_state); } - elseif (!isset($options[$elements['#value']])) { + else if (!isset($options[$elements['#value']])) { form_error($elements, $t('An illegal choice has been detected. Please contact the site administrator.')); watchdog('form', 'Illegal choice %choice in %name element.', array('%choice' => $elements['#value'], '%name' => empty($elements['#title']) ? $elements['#parents'][0] : $elements['#title']), WATCHDOG_ERROR); } @@ -1353,7 +1353,7 @@ function _form_validate(&$elements, &$form_state, $form_id = NULL) { // #limit_validation_errors property. For button element types, // #limit_validation_errors defaults to FALSE (via system_element_info()), // so that full validation is their default behavior. - elseif (isset($form_state['triggering_element']) && !isset($form_state['triggering_element']['#limit_validation_errors']) && !$form_state['submitted']) { + else if (isset($form_state['triggering_element']) && !isset($form_state['triggering_element']['#limit_validation_errors']) && !$form_state['submitted']) { form_set_error(NULL, '', array()); } // As an extra security measure, explicitly turn off error suppression if @@ -1394,7 +1394,7 @@ function _form_validate(&$elements, &$form_state, $form_id = NULL) { } // Call any element-specific validators. These must act on the element // #value data. - elseif (isset($elements['#element_validate'])) { + else if (isset($elements['#element_validate'])) { foreach ($elements['#element_validate'] as $function) { $function($elements, $form_state, $form_state['complete_form']); } @@ -1431,7 +1431,7 @@ function form_execute_handlers($type, &$form, &$form_state) { $handlers = $form_state[$type . '_handlers']; } // Otherwise, check for a form-level handler. - elseif (isset($form['#' . $type])) { + else if (isset($form['#' . $type])) { $handlers = $form['#' . $type]; } else { @@ -1927,7 +1927,7 @@ function _form_builder_handle_input_element($form_id, &$element, &$form_state) { // nested file names. $element['#name'] = 'files[' . $element['#name'] . ']'; } - elseif (count($element['#parents'])) { + else if (count($element['#parents'])) { $element['#name'] .= '[' . implode('][', $element['#parents']) . ']'; } array_unshift($element['#parents'], $name); @@ -2107,7 +2107,7 @@ function _form_button_was_clicked($element, &$form_state) { // coordinates of the click on the button image. This means that image // buttons MUST have unique $form['#name'] values, but the details of // their $_POST data should be ignored. - elseif (!empty($element['#has_garbage_value']) && isset($element['#value']) && $element['#value'] !== '') { + else if (!empty($element['#has_garbage_value']) && isset($element['#value']) && $element['#value'] !== '') { return TRUE; } return FALSE; @@ -2279,7 +2279,7 @@ function form_type_checkboxes_value($element, $input = FALSE) { } return $value; } - elseif (is_array($input)) { + else if (is_array($input)) { // Programmatic form submissions use NULL to indicate that a checkbox // should be unchecked; see drupal_form_submit(). We therefore remove all // NULL elements from the array before constructing the return value, to @@ -2335,7 +2335,7 @@ function form_type_radios_value(&$element, $input = FALSE) { // processed properly. return $input; } - elseif (isset($element['#default_value'])) { + else if (isset($element['#default_value'])) { return $element['#default_value']; } } @@ -2428,7 +2428,7 @@ function form_type_select_value($element, $input = FALSE) { // other non-string constant. PHP receives all submitted form input as // strings, but if the empty option is selected, set the value to match the // empty value exactly. - elseif (isset($element['#empty_value']) && $input === (string) $element['#empty_value']) { + else if (isset($element['#empty_value']) && $input === (string) $element['#empty_value']) { return $element['#empty_value']; } else { @@ -2539,7 +2539,7 @@ function _form_options_flatten($array) { if (is_object($value)) { _form_options_flatten($value->option); } - elseif (is_array($value)) { + else if (is_array($value)) { _form_options_flatten($value); } else { @@ -2667,7 +2667,7 @@ function form_select_options($element, $choices = NULL) { $options .= form_select_options($element, $choice); $options .= ''; } - elseif (is_object($choice)) { + else if (is_object($choice)) { $options .= form_select_options($element, $choice->option); } else { @@ -2722,12 +2722,12 @@ function form_get_options($element, $key) { if (is_array($choice)) { return FALSE; } - elseif (is_object($choice)) { + else if (is_object($choice)) { if (isset($choice->option[$key])) { $keys[] = $index; } } - elseif ($index == $key) { + else if ($index == $key) { $keys[] = $index; } } @@ -2858,7 +2858,7 @@ function password_confirm_validate($element, &$element_state) { form_error($element, t('The specified passwords do not match.')); } } - elseif ($element['#required'] && !empty($element_state['input'])) { + else if ($element['#required'] && !empty($element_state['input'])) { form_error($element, t('Password field is required.')); } @@ -3631,12 +3631,12 @@ function form_pre_render_fieldset($element) { // Intentionally empty to clarify the flow; we simply return $element. } // If we injected this element into the group, then we want to render it. - elseif (!empty($element['#group_fieldset'])) { + else if (!empty($element['#group_fieldset'])) { // Intentionally empty to clarify the flow; we simply return $element. } // Otherwise, this element belongs to a group and the group exists, so we do // not render it. - elseif (element_children($element['#groups'][$group])) { + else if (element_children($element['#groups'][$group])) { $element['#printed'] = TRUE; } } @@ -4291,7 +4291,7 @@ function theme_form_element_label($variables) { $attributes['class'] = 'option'; } // Show label only to screen readers to avoid disruption in visual flows. - elseif ($element['#title_display'] == 'invisible') { + else if ($element['#title_display'] == 'invisible') { $attributes['class'] = 'element-invisible'; } diff --git a/core/includes/gettext.inc b/core/includes/gettext.inc index 18c27ea..1b69653 100644 --- a/core/includes/gettext.inc +++ b/core/includes/gettext.inc @@ -136,7 +136,7 @@ function _locale_import_read_po($op, $file, $mode = NULL, $lang = NULL) { // Already in comment token, insert the comment. $current['#'][] = substr($line, 1); } - elseif (($context == 'MSGSTR') || ($context == 'MSGSTR_ARR')) { + else if (($context == 'MSGSTR') || ($context == 'MSGSTR_ARR')) { // We are currently in string token, close it out. _locale_import_one_string($op, $current, $mode, $lang, $file); @@ -152,7 +152,7 @@ function _locale_import_read_po($op, $file, $mode = NULL, $lang = NULL) { return FALSE; } } - elseif (!strncmp('msgid_plural', $line, 12)) { + else if (!strncmp('msgid_plural', $line, 12)) { // A plural form for the current message. if ($context != 'MSGID') { @@ -177,7 +177,7 @@ function _locale_import_read_po($op, $file, $mode = NULL, $lang = NULL) { $context = 'MSGID_PLURAL'; } - elseif (!strncmp('msgid', $line, 5)) { + else if (!strncmp('msgid', $line, 5)) { // Starting a new message. if (($context == 'MSGSTR') || ($context == 'MSGSTR_ARR')) { @@ -187,7 +187,7 @@ function _locale_import_read_po($op, $file, $mode = NULL, $lang = NULL) { // Start a new context for the id. $current = array(); } - elseif ($context == 'MSGID') { + else if ($context == 'MSGID') { // We are currently already in the context, meaning we passed an id with no data. _locale_import_message('The translation file %filename contains an error: "msgid" is unexpected on line %line.', $file, $lineno); return FALSE; @@ -207,7 +207,7 @@ function _locale_import_read_po($op, $file, $mode = NULL, $lang = NULL) { $current['msgid'] = $quoted; $context = 'MSGID'; } - elseif (!strncmp('msgctxt', $line, 7)) { + else if (!strncmp('msgctxt', $line, 7)) { // Starting a new context. if (($context == 'MSGSTR') || ($context == 'MSGSTR_ARR')) { @@ -215,7 +215,7 @@ function _locale_import_read_po($op, $file, $mode = NULL, $lang = NULL) { _locale_import_one_string($op, $current, $mode, $lang, $file); $current = array(); } - elseif (!empty($current['msgctxt'])) { + else if (!empty($current['msgctxt'])) { // A context cannot apply to another context. _locale_import_message('The translation file %filename contains an error: "msgctxt" is unexpected on line %line.', $file, $lineno); return FALSE; @@ -236,7 +236,7 @@ function _locale_import_read_po($op, $file, $mode = NULL, $lang = NULL) { $context = 'MSGCTXT'; } - elseif (!strncmp('msgstr[', $line, 7)) { + else if (!strncmp('msgstr[', $line, 7)) { // A message string for a specific plurality. if (($context != 'MSGID') && ($context != 'MSGCTXT') && ($context != 'MSGID_PLURAL') && ($context != 'MSGSTR_ARR')) { @@ -269,7 +269,7 @@ function _locale_import_read_po($op, $file, $mode = NULL, $lang = NULL) { $context = 'MSGSTR_ARR'; } - elseif (!strncmp("msgstr", $line, 6)) { + else if (!strncmp("msgstr", $line, 6)) { // A string for the an id or context. if (($context != 'MSGID') && ($context != 'MSGCTXT')) { @@ -293,7 +293,7 @@ function _locale_import_read_po($op, $file, $mode = NULL, $lang = NULL) { $context = 'MSGSTR'; } - elseif ($line != '') { + else if ($line != '') { // Anything that is not a token may be a continuation of a previous token. $quoted = _locale_import_parse_quoted($line); @@ -307,13 +307,13 @@ function _locale_import_read_po($op, $file, $mode = NULL, $lang = NULL) { if (($context == 'MSGID') || ($context == 'MSGID_PLURAL')) { $current['msgid'] .= $quoted; } - elseif ($context == 'MSGCTXT') { + else if ($context == 'MSGCTXT') { $current['msgctxt'] .= $quoted; } - elseif ($context == 'MSGSTR') { + else if ($context == 'MSGSTR') { $current['msgstr'] .= $quoted; } - elseif ($context == 'MSGSTR_ARR') { + else if ($context == 'MSGSTR_ARR') { $current['msgstr'][$plural] .= $quoted; } else { @@ -328,7 +328,7 @@ function _locale_import_read_po($op, $file, $mode = NULL, $lang = NULL) { if (($context == 'MSGSTR') || ($context == 'MSGSTR_ARR')) { _locale_import_one_string($op, $current, $mode, $lang, $file); } - elseif ($context != 'COMMENT') { + else if ($context != 'COMMENT') { _locale_import_message('The translation file %filename ended unexpectedly at line %line.', $file, $lineno); return FALSE; } @@ -470,7 +470,7 @@ function _locale_import_one_string_db(&$report, $langcode, $context, $source, $t $report['skips']++; $lid = 0; } - elseif ($lid) { + else if ($lid) { // We have this source string saved already. db_update('locales_source') ->fields(array( @@ -493,7 +493,7 @@ function _locale_import_one_string_db(&$report, $langcode, $context, $source, $t $report['additions']++; } - elseif ($mode == LOCALE_IMPORT_OVERWRITE) { + else if ($mode == LOCALE_IMPORT_OVERWRITE) { // Translation exists, only overwrite if instructed. db_update('locales_target') ->fields(array( @@ -527,7 +527,7 @@ function _locale_import_one_string_db(&$report, $langcode, $context, $source, $t $report['additions']++; } } - elseif ($mode == LOCALE_IMPORT_OVERWRITE) { + else if ($mode == LOCALE_IMPORT_OVERWRITE) { // Empty translation, remove existing if instructed. db_delete('locales_target') ->condition('language', $langcode) @@ -638,20 +638,20 @@ function _locale_import_parse_arithmetic($string) { if (is_numeric($token)) { $element_stack[] = $current_token; } - elseif ($current_token == "n") { + else if ($current_token == "n") { $element_stack[] = '$n'; } - elseif ($current_token == "(") { + else if ($current_token == "(") { $operator_stack[] = $current_token; } - elseif ($current_token == ")") { + else if ($current_token == ")") { $topop = array_pop($operator_stack); while (isset($topop) && ($topop != "(")) { $element_stack[] = $topop; $topop = array_pop($operator_stack); } } - elseif (!empty($precedence[$current_token])) { + else if (!empty($precedence[$current_token])) { // If it's an operator, then pop from $operator_stack into $element_stack until the // precedence in $operator_stack is less than current, then push into $operator_stack $topop = array_pop($operator_stack); @@ -687,7 +687,7 @@ function _locale_import_parse_arithmetic($string) { if ($op == ":") { $f = $element_stack[$i - 2] . "):" . $element_stack[$i - 1] . ")"; } - elseif ($op == "?") { + else if ($op == "?") { $f = "(" . $element_stack[$i - 2] . "?(" . $element_stack[$i - 1]; } else { @@ -731,7 +731,7 @@ function _locale_import_tokenize_formula($formula) { $i = $j - 1; $tokens[] = $num; } - elseif ($pos = strpos(" =<>!&|", $formula[$i])) { // We won't have a space + else if ($pos = strpos(" =<>!&|", $formula[$i])) { // We won't have a space $next = $formula[$i + 1]; switch ($pos) { case 1: @@ -814,7 +814,7 @@ function _locale_import_parse_quoted($string) { if ($quote == '"') { // Double quotes: strip slashes return stripcslashes($string); } - elseif ($quote == "'") { // Simple quote: return as-is + else if ($quote == "'") { // Simple quote: return as-is return $string; } else { @@ -1005,7 +1005,7 @@ function _locale_export_string($str) { return "\"\"\n\"" . implode("\"\n\"", $parts) . "\"\n"; } // Single line string - elseif (count($parts) == 1) { + else if (count($parts) == 1) { return "\"$parts[0]\"\n"; } // No translation @@ -1029,7 +1029,7 @@ function _locale_export_wrap($str, $len) { $cur = $word; $nstr = 0; } - elseif (strlen("$cur $word") > $len) { + else if (strlen("$cur $word") > $len) { $return[] = $cur . " "; $cur = $word; } diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index 07e25a0..12b5743 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -99,7 +99,7 @@ function install_drupal($settings = array()) { // Redirect to the correct page if the URL parameters have changed. install_goto(install_redirect_url($install_state)); } - elseif (isset($output)) { + else if (isset($output)) { // Display a page only if some output is available. Otherwise it is // possible that we are printing a JSON page and theme output should // not be shown. @@ -447,7 +447,7 @@ function install_run_task($task, &$install_state) { } } - elseif ($task['type'] == 'batch') { + else if ($task['type'] == 'batch') { // Start a new batch based on the task function, if one is not running // already. $current_batch = variable_get('install_current_batch'); @@ -475,7 +475,7 @@ function install_run_task($task, &$install_state) { } // If we are in the middle of processing this batch, keep sending back // any output from the batch process, until the task is complete. - elseif ($current_batch == $function) { + else if ($current_batch == $function) { include_once DRUPAL_ROOT . '/core/includes/batch.inc'; $output = _batch_page(); // The task is complete when we try to access the batch page and receive @@ -1675,7 +1675,7 @@ function install_check_requirements($install_state) { } // Otherwise, if settings.php does not exist yet, we can try to copy // default.settings.php to create it. - elseif (!$exists) { + else if (!$exists) { $copied = drupal_verify_install_file($conf_path, FILE_EXIST|FILE_WRITABLE, 'dir') && @copy($default_settings_file, $settings_file); if ($copied) { // If the new settings file has the same owner as default.settings.php, diff --git a/core/includes/install.inc b/core/includes/install.inc index 199ec1c..d4795fa 100644 --- a/core/includes/install.inc +++ b/core/includes/install.inc @@ -223,7 +223,7 @@ function drupal_rewrite_settings($settings = array()) { } } // Check for variables. - elseif (substr($line, 0, 1) == '$') { + else if (substr($line, 0, 1) == '$') { preg_match('/\$([^ ]*) /', $line, $variable); if (in_array($variable[1], $keys)) { // Write new value to settings.php in the following format: diff --git a/core/includes/locale.inc b/core/includes/locale.inc index 1f9567b..1c17997 100644 --- a/core/includes/locale.inc +++ b/core/includes/locale.inc @@ -427,7 +427,7 @@ function locale_language_url_rewrite_url(&$path, &$options) { $options['language'] = $language_url; } // We allow only enabled languages here. - elseif (!isset($languages[$options['language']->langcode])) { + else if (!isset($languages[$options['language']->langcode])) { unset($options['language']); return; } @@ -446,7 +446,7 @@ function locale_language_url_rewrite_url(&$path, &$options) { if ($options['https'] === TRUE) { $options['base_url'] = str_replace('http://', 'https://', $options['base_url']); } - elseif ($options['https'] === FALSE) { + else if ($options['https'] === FALSE) { $options['base_url'] = str_replace('https://', 'http://', $options['base_url']); } } @@ -775,7 +775,7 @@ function _locale_rebuild_js($langcode = NULL) { } // If the file did not exist previously and the data has changed we have // a fresh creation. - elseif ($changed_hash) { + else if ($changed_hash) { $status = 'created'; } // If the data hash is unchanged the translation was lost and has to be diff --git a/core/includes/mail.inc b/core/includes/mail.inc index f58a76e..53e9e71 100644 --- a/core/includes/mail.inc +++ b/core/includes/mail.inc @@ -267,7 +267,7 @@ function drupal_mail_system($module, $key) { if (isset($configuration[$id])) { $class = $configuration[$id]; } - elseif (isset($configuration[$module])) { + else if (isset($configuration[$module])) { $class = $configuration[$module]; } else { diff --git a/core/includes/menu.inc b/core/includes/menu.inc index 511c5d0..7911b5d 100644 --- a/core/includes/menu.inc +++ b/core/includes/menu.inc @@ -323,7 +323,7 @@ function menu_get_ancestors($parts) { // Only look at masks that are not longer than the path of interest. continue; } - elseif ($i < (1 << $length)) { + else if ($i < (1 << $length)) { // We have exhausted the masks of a given length, so decrease the length. --$length; } @@ -679,7 +679,7 @@ function _menu_item_localize(&$item, $map, $link_translate = FALSE) { $item['title'] = t($item['title'], menu_unserialize($item['title_arguments'], $map)); } } - elseif ($callback) { + else if ($callback) { if (empty($item['title_arguments'])) { $item['title'] = $callback($item['title']); } @@ -692,7 +692,7 @@ function _menu_item_localize(&$item, $map, $link_translate = FALSE) { } } } - elseif ($link_translate) { + else if ($link_translate) { $item['title'] = $item['link_title']; } @@ -879,7 +879,7 @@ function _menu_link_translate(&$item, $translate = FALSE) { // 'foo/%/bar'. This inheritance is only valid for breadcrumb links. // @see _menu_tree_check_access() // @see menu_get_active_breadcrumb() - elseif ($translate && ($current_router_item = menu_get_item())) { + else if ($translate && ($current_router_item = menu_get_item())) { // If $translate is TRUE, then this link is in the active trail. // Only translate paths within the current path. if (strpos($current_router_item['path'], $item['link_path']) === 0) { @@ -1025,7 +1025,7 @@ function menu_tree_output($tree) { if ($data['link']['has_children'] && $data['below']) { $class[] = 'expanded'; } - elseif ($data['link']['has_children']) { + else if ($data['link']['has_children']) { $class[] = 'collapsed'; } else { @@ -1401,7 +1401,7 @@ function _menu_build_tree($menu_name, array $parameters = array()) { if (!empty($parameters['expanded'])) { $query->condition('ml.plid', $parameters['expanded'], 'IN'); } - elseif (!empty($parameters['only_active_trail'])) { + else if (!empty($parameters['only_active_trail'])) { $query->condition('ml.mlid', $parameters['active_trail'], 'IN'); } $min_depth = (isset($parameters['min_depth']) ? $parameters['min_depth'] : 1); @@ -1667,7 +1667,7 @@ function theme_menu_local_action($variables) { if (isset($link['href'])) { $output .= l($link['title'], $link['href'], isset($link['localized_options']) ? $link['localized_options'] : array()); } - elseif (!empty($link['localized_options']['html'])) { + else if (!empty($link['localized_options']['html'])) { $output .= $link['title']; } else { @@ -2074,7 +2074,7 @@ function menu_local_tasks($level = 0) { } // @todo If there are no tabs, then there still can be actions; for example, // when added via hook_menu_local_tasks_alter(). - elseif (!empty($data['actions']['output'])) { + else if (!empty($data['actions']['output'])) { return array('actions' => $data['actions']) + $empty; } return $empty; @@ -2267,7 +2267,7 @@ function menu_set_active_menu_names($menu_names = NULL) { if (isset($menu_names) && is_array($menu_names)) { $active = $menu_names; } - elseif (!isset($active)) { + else if (!isset($active)) { $active = variable_get('menu_default_active_menus', array_keys(menu_list_system_menus())); } return $active; @@ -2323,7 +2323,7 @@ function menu_set_active_trail($new_trail = NULL) { if (isset($new_trail)) { $trail = $new_trail; } - elseif (!isset($trail)) { + else if (!isset($trail)) { $trail = array(); $trail[] = array( 'title' => t('Home'), @@ -2731,7 +2731,7 @@ function _menu_link_build($item) { $item['hidden'] = 1; } // Hide all items that are not visible in the tree. - elseif (!($item['type'] & MENU_VISIBLE_IN_TREE)) { + else if (!($item['type'] & MENU_VISIBLE_IN_TREE)) { $item['hidden'] = -1; } // Note, we set this as 'system', so that we can be sure to distinguish all @@ -3248,7 +3248,7 @@ function _menu_clear_page_cache() { _menu_set_expanded_menus(); $cache_cleared = 1; } - elseif ($cache_cleared == 1) { + else if ($cache_cleared == 1) { drupal_register_shutdown_function('cache_clear_all'); // Keep track of which menus have expanded items. drupal_register_shutdown_function('_menu_set_expanded_menus'); @@ -3291,7 +3291,7 @@ function _menu_find_router_path($link_path) { ->range(0, 1) ->execute()->fetchField(); } - elseif (!isset($menu[$router_path])) { + else if (!isset($menu[$router_path])) { // Add an empty router path as a fallback. $ancestors[] = ''; foreach ($ancestors as $key => $router_path) { @@ -3564,7 +3564,7 @@ function _menu_router_build($callbacks) { $item['tab_root'] = $path; } // If not specified, assign the default tab type for local tasks. - elseif (!isset($item['context'])) { + else if (!isset($item['context'])) { $item['context'] = MENU_CONTEXT_PAGE; } for ($i = $item['_number_parts'] - 1; $i; $i--) { diff --git a/core/includes/module.inc b/core/includes/module.inc index df9c138..5673047 100644 --- a/core/includes/module.inc +++ b/core/includes/module.inc @@ -148,7 +148,7 @@ function system_list($type) { $lists['bootstrap'] = array_keys($bootstrap_list); } // Otherwise build the list for enabled modules and themes. - elseif (!isset($lists['module_enabled'])) { + else if (!isset($lists['module_enabled'])) { if ($cached = cache('bootstrap')->get('system_list')) { $lists = $cached->data; } @@ -838,7 +838,7 @@ function module_invoke_all($hook) { if (isset($result) && is_array($result)) { $return = array_merge_recursive($return, $result); } - elseif (isset($result)) { + else if (isset($result)) { $return[] = $result; } } diff --git a/core/includes/pager.inc b/core/includes/pager.inc index c579e7e..19a01ff 100644 --- a/core/includes/pager.inc +++ b/core/includes/pager.inc @@ -628,7 +628,7 @@ function theme_pager_link($variables) { if (isset($titles[$text])) { $attributes['title'] = $titles[$text]; } - elseif (is_numeric($text)) { + else if (is_numeric($text)) { $attributes['title'] = t('Go to page @number', array('@number' => $text)); } } diff --git a/core/includes/password.inc b/core/includes/password.inc index b052a4a..4f17e70 100644 --- a/core/includes/password.inc +++ b/core/includes/password.inc @@ -122,7 +122,7 @@ function _password_enforce_log2_boundaries($count_log2) { if ($count_log2 < DRUPAL_MIN_HASH_COUNT) { return DRUPAL_MIN_HASH_COUNT; } - elseif ($count_log2 > DRUPAL_MAX_HASH_COUNT) { + else if ($count_log2 > DRUPAL_MAX_HASH_COUNT) { return DRUPAL_MAX_HASH_COUNT; } diff --git a/core/includes/path.inc b/core/includes/path.inc index 223ab04..89820db 100644 --- a/core/includes/path.inc +++ b/core/includes/path.inc @@ -80,7 +80,7 @@ function drupal_lookup_path($action, $path = '', $langcode = NULL) { $cache = array(); $cache['whitelist'] = drupal_path_alias_whitelist_rebuild(); } - elseif ($cache['whitelist'] && $path != '') { + else if ($cache['whitelist'] && $path != '') { if ($action == 'alias') { // During the first call to drupal_lookup_path() per language, load the // expected system paths for the page from cache. @@ -110,7 +110,7 @@ function drupal_lookup_path($action, $path = '', $langcode = NULL) { unset($args[':langcode']); $result = db_query('SELECT source, alias FROM {url_alias} WHERE source IN (:system) AND langcode = :langcode_undetermined ORDER BY pid ASC', $args); } - elseif ($langcode < LANGUAGE_NOT_SPECIFIED) { + else if ($langcode < LANGUAGE_NOT_SPECIFIED) { $result = db_query('SELECT source, alias FROM {url_alias} WHERE source IN (:system) AND langcode IN (:langcode, :langcode_undetermined) ORDER BY langcode ASC, pid ASC', $args); } else { @@ -128,11 +128,11 @@ function drupal_lookup_path($action, $path = '', $langcode = NULL) { // Check the path whitelist, if the top_level part before the first / // is not in the list, then there is no need to do anything further, // it is not in the database. - elseif (!isset($cache['whitelist'][strtok($path, '/')])) { + else if (!isset($cache['whitelist'][strtok($path, '/')])) { return FALSE; } // For system paths which were not cached, query aliases individually. - elseif (!isset($cache['no_aliases'][$langcode][$path])) { + else if (!isset($cache['no_aliases'][$langcode][$path])) { $args = array( ':source' => $path, ':langcode' => $langcode, @@ -143,7 +143,7 @@ function drupal_lookup_path($action, $path = '', $langcode = NULL) { unset($args[':langcode']); $alias = db_query("SELECT alias FROM {url_alias} WHERE source = :source AND langcode = :langcode_undetermined ORDER BY pid DESC", $args)->fetchField(); } - elseif ($langcode > LANGUAGE_NOT_SPECIFIED) { + else if ($langcode > LANGUAGE_NOT_SPECIFIED) { $alias = db_query("SELECT alias FROM {url_alias} WHERE source = :source AND langcode IN (:langcode, :langcode_undetermined) ORDER BY langcode DESC, pid DESC", $args)->fetchField(); } else { @@ -155,7 +155,7 @@ function drupal_lookup_path($action, $path = '', $langcode = NULL) { } // Check $no_source for this $path in case we've already determined that there // isn't a path that has this alias - elseif ($action == 'source' && !isset($cache['no_source'][$langcode][$path])) { + else if ($action == 'source' && !isset($cache['no_source'][$langcode][$path])) { // Look for the value $path within the cached $map $source = FALSE; if (!isset($cache['map'][$langcode]) || !($source = array_search($path, $cache['map'][$langcode]))) { @@ -169,7 +169,7 @@ function drupal_lookup_path($action, $path = '', $langcode = NULL) { unset($args[':langcode']); $result = db_query("SELECT source FROM {url_alias} WHERE alias = :alias AND langcode = :langcode_undetermined ORDER BY pid DESC", $args); } - elseif ($langcode > LANGUAGE_NOT_SPECIFIED) { + else if ($langcode > LANGUAGE_NOT_SPECIFIED) { $result = db_query("SELECT source FROM {url_alias} WHERE alias = :alias AND langcode IN (:langcode, :langcode_undetermined) ORDER BY langcode DESC, pid DESC", $args); } else { @@ -404,10 +404,10 @@ function path_load($conditions) { if (is_numeric($conditions)) { $conditions = array('pid' => $conditions); } - elseif (is_string($conditions)) { + else if (is_string($conditions)) { $conditions = array('source' => $conditions); } - elseif (!is_array($conditions)) { + else if (!is_array($conditions)) { return FALSE; } $select = db_select('url_alias'); @@ -557,7 +557,7 @@ function drupal_valid_path($path, $dynamic_allowed = FALSE) { if ($path == '' || url_is_external($path)) { $item = array('access' => TRUE); } - elseif ($dynamic_allowed && preg_match('/\/\%/', $path)) { + else if ($dynamic_allowed && preg_match('/\/\%/', $path)) { // Path is dynamic (ie 'user/%'), so check directly against menu_router table. if ($item = db_query("SELECT * FROM {menu_router} where path = :path", array(':path' => $path))->fetchAssoc()) { $item['link_path'] = $form_item['link_path']; diff --git a/core/includes/schema.inc b/core/includes/schema.inc index 18fab75..ab3b648 100644 --- a/core/includes/schema.inc +++ b/core/includes/schema.inc @@ -30,7 +30,7 @@ function drupal_get_schema($table = NULL, $rebuild = FALSE) { if ($rebuild || !isset($table)) { $schema = drupal_get_complete_schema($rebuild); } - elseif (!isset($schema)) { + else if (!isset($schema)) { $schema = new SchemaCache(); } @@ -282,7 +282,7 @@ function drupal_get_schema_unprocessed($module, $table = NULL) { if (isset($table) && isset($schema[$table])) { return $schema[$table]; } - elseif (!empty($schema)) { + else if (!empty($schema)) { return $schema; } return array(); @@ -428,7 +428,7 @@ function drupal_write_record($table, &$record, $primary_keys = array()) { if ($info['type'] == 'int' || $info['type'] == 'serial') { $fields[$field] = (int) $fields[$field]; } - elseif ($info['type'] == 'float') { + else if ($info['type'] == 'float') { $fields[$field] = (float) $fields[$field]; } else { @@ -487,7 +487,7 @@ function drupal_write_record($table, &$record, $primary_keys = array()) { // query failed. Note that we explicitly check for FALSE, because // a valid update query which doesn't change any values will return // zero (0) affected rows. - elseif ($query_return === FALSE && count($primary_keys) == 1) { + else if ($query_return === FALSE && count($primary_keys) == 1) { $return = FALSE; } diff --git a/core/includes/session.inc b/core/includes/session.inc index b07997c..9ea20cf 100644 --- a/core/includes/session.inc +++ b/core/includes/session.inc @@ -113,7 +113,7 @@ function _drupal_session_read($sid) { $user->roles[DRUPAL_AUTHENTICATED_RID] = 'authenticated user'; $user->roles += db_query("SELECT r.rid, r.name FROM {role} r INNER JOIN {users_roles} ur ON ur.rid = r.rid WHERE ur.uid = :uid", array(':uid' => $user->uid))->fetchAllKeyed(0, 1); } - elseif ($user) { + else if ($user) { // The user is anonymous or blocked. Only preserve two fields from the // {sessions} table. $account = drupal_anonymous_user(); @@ -198,7 +198,7 @@ function _drupal_session_write($sid, $value) { } } } - elseif (variable_get('https', FALSE)) { + else if (variable_get('https', FALSE)) { unset($key['ssid']); } @@ -386,7 +386,7 @@ function drupal_session_regenerate() { ->condition($is_https ? 'ssid' : 'sid', $old_session_id) ->execute(); } - elseif (isset($old_insecure_session_id)) { + else if (isset($old_insecure_session_id)) { // If logging in to the secure site, and there was no active session on the // secure site but a session was active on the insecure site, update the // insecure session with the new session identifiers. @@ -432,7 +432,7 @@ function _drupal_session_destroy($sid) { if ($is_https) { _drupal_session_delete_cookie(substr(session_name(), 1), FALSE); } - elseif (variable_get('https', FALSE)) { + else if (variable_get('https', FALSE)) { _drupal_session_delete_cookie('S' . session_name(), TRUE); } } diff --git a/core/includes/theme.inc b/core/includes/theme.inc index d044f06..919bb44 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -412,7 +412,7 @@ class ThemeRegistry Extends CacheArray { if (isset($this->storage[$offset])) { return $this->storage[$offset]; } - elseif (array_key_exists($offset, $this->storage)) { + else if (array_key_exists($offset, $this->storage)) { return $this->resolveCacheMiss($offset); } } @@ -579,7 +579,7 @@ function _theme_process_registry(&$cache, $name, $type, $theme, $path) { // if they are not the owner of the current hook. $prefixes += module_list(); } - elseif ($type == 'theme_engine' || $type == 'base_theme_engine') { + else if ($type == 'theme_engine' || $type == 'base_theme_engine') { // Theme engines get an extra set that come before the normally // named variable processors. $prefixes[] = $name . '_engine'; @@ -610,7 +610,7 @@ function _theme_process_registry(&$cache, $name, $type, $theme, $path) { // Flag not needed inside the registry. unset($result[$hook]['override ' . $phase_key]); } - elseif (isset($cache[$hook][$phase_key]) && is_array($cache[$hook][$phase_key])) { + else if (isset($cache[$hook][$phase_key]) && is_array($cache[$hook][$phase_key])) { $info[$phase_key] = array_merge($cache[$hook][$phase_key], $info[$phase_key]); } $result[$hook][$phase_key] = $info[$phase_key]; @@ -1023,7 +1023,7 @@ function theme($hook, $variables = array()) { if (!empty($info['variables'])) { $variables += $info['variables']; } - elseif (!empty($info['render element'])) { + else if (!empty($info['render element'])) { $variables += array($info['render element'] => array()); } @@ -1416,7 +1416,7 @@ function theme_get_setting($setting_name, $theme = NULL) { if ($cache[$theme]['default_logo']) { $cache[$theme]['logo'] = file_create_url(dirname($theme_object->filename) . '/logo.png'); } - elseif ($cache[$theme]['logo_path']) { + else if ($cache[$theme]['logo_path']) { $cache[$theme]['logo'] = file_create_url($cache[$theme]['logo_path']); } } @@ -1431,7 +1431,7 @@ function theme_get_setting($setting_name, $theme = NULL) { $cache[$theme]['favicon'] = file_create_url('core/misc/favicon.ico'); } } - elseif ($cache[$theme]['favicon_path']) { + else if ($cache[$theme]['favicon_path']) { $cache[$theme]['favicon'] = file_create_url($cache[$theme]['favicon_path']); } else { @@ -1543,7 +1543,7 @@ function template_preprocess_datetime(&$variables) { $variables['html'] = FALSE; } // Otherwise, use the literal datetime attribute. - elseif (isset($variables['attributes']['datetime'])) { + else if (isset($variables['attributes']['datetime'])) { $variables['text'] = $variables['attributes']['datetime']; $variables['html'] = FALSE; } @@ -2063,7 +2063,7 @@ function theme_mark($variables) { if ($type == MARK_NEW) { return ' ' . t('new') . ''; } - elseif ($type == MARK_UPDATED) { + else if ($type == MARK_UPDATED) { return ' ' . t('updated') . ''; } } @@ -2475,10 +2475,10 @@ function template_preprocess_html(&$variables) { if (!empty($variables['page']['sidebar_first']) && !empty($variables['page']['sidebar_second'])) { $variables['classes_array'][] = 'two-sidebars'; } - elseif (!empty($variables['page']['sidebar_first'])) { + else if (!empty($variables['page']['sidebar_first'])) { $variables['classes_array'][] = 'one-sidebar sidebar-first'; } - elseif (!empty($variables['page']['sidebar_second'])) { + else if (!empty($variables['page']['sidebar_second'])) { $variables['classes_array'][] = 'one-sidebar sidebar-second'; } else { @@ -2809,7 +2809,7 @@ function template_preprocess_maintenance_page(&$variables) { if ($variables['layout'] == 'both') { $variables['classes_array'][] = 'two-sidebars'; } - elseif ($variables['layout'] == 'none') { + else if ($variables['layout'] == 'none') { $variables['classes_array'][] = 'no-sidebars'; } else { diff --git a/core/includes/unicode.inc b/core/includes/unicode.inc index 1450b43..5d2130b 100644 --- a/core/includes/unicode.inc +++ b/core/includes/unicode.inc @@ -229,10 +229,10 @@ function drupal_convert_to_utf8($data, $encoding) { if (function_exists('iconv')) { $out = @iconv($encoding, 'utf-8', $data); } - elseif (function_exists('mb_convert_encoding')) { + else if (function_exists('mb_convert_encoding')) { $out = @mb_convert_encoding($data, 'utf-8', $encoding); } - elseif (function_exists('recode_string')) { + else if (function_exists('recode_string')) { $out = @recode_string($encoding . '..utf-8', $data); } else { @@ -536,7 +536,7 @@ function drupal_substr($text, $start, $length = NULL) { } } } - elseif ($start < 0) { + else if ($start < 0) { // Count all the continuation bytes from the end until we have found // abs($start) characters. $start = abs($start); @@ -555,7 +555,7 @@ function drupal_substr($text, $start, $length = NULL) { if ($length === NULL) { $iend = $strlen; } - elseif ($length > 0) { + else if ($length > 0) { // Count all the continuation bytes from the starting index until we have // found $length characters or reached the end of the string, then // backtrace one byte. @@ -577,7 +577,7 @@ function drupal_substr($text, $start, $length = NULL) { $iend--; } } - elseif ($length < 0) { + else if ($length < 0) { // Count all the continuation bytes from the end until we have found // abs($start) characters, then backtrace one byte. $length = abs($length); diff --git a/core/includes/update.inc b/core/includes/update.inc index 1a2a242..eb4c0d9 100644 --- a/core/includes/update.inc +++ b/core/includes/update.inc @@ -55,7 +55,7 @@ function update_check_incompatibility($name, $type = 'module') { if ($type == 'module' && isset($modules[$name])) { $file = $modules[$name]; } - elseif ($type == 'theme' && isset($themes[$name])) { + else if ($type == 'theme' && isset($themes[$name])) { $file = $themes[$name]; } if (!isset($file) @@ -612,7 +612,7 @@ function update_resolve_dependencies($starting_updates) { $graph[$dependent]['missing_dependencies'][] = $function; } } - elseif (!isset($data['allowed'])) { + else if (!isset($data['allowed'])) { $data['allowed'] = TRUE; $data['missing_dependencies'] = array(); } diff --git a/core/includes/utility.inc b/core/includes/utility.inc index d44e4dd..605d2fe 100644 --- a/core/includes/utility.inc +++ b/core/includes/utility.inc @@ -30,10 +30,10 @@ function drupal_var_export($var, $prefix = '') { $output .= ')'; } } - elseif (is_bool($var)) { + else if (is_bool($var)) { $output = $var ? 'TRUE' : 'FALSE'; } - elseif (is_string($var)) { + else if (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 diff --git a/core/includes/xmlrpc.inc b/core/includes/xmlrpc.inc index b1c6f39..28cb503 100644 --- a/core/includes/xmlrpc.inc +++ b/core/includes/xmlrpc.inc @@ -188,7 +188,7 @@ function xmlrpc_message_parse($xmlrpc_message) { if (!isset($xmlrpc_message->messagetype)) { return FALSE; } - elseif ($xmlrpc_message->messagetype == 'fault') { + else if ($xmlrpc_message->messagetype == 'fault') { $xmlrpc_message->fault_code = $xmlrpc_message->params[0]['faultCode']; $xmlrpc_message->fault_string = $xmlrpc_message->params[0]['faultString']; } @@ -409,7 +409,7 @@ function xmlrpc_error($code = NULL, $message = NULL, $reset = FALSE) { $xmlrpc_error->code = $code; $xmlrpc_error->message = $message; } - elseif ($reset) { + else if ($reset) { $xmlrpc_error = NULL; } return $xmlrpc_error; diff --git a/core/includes/xmlrpcs.inc b/core/includes/xmlrpcs.inc index 118f652..ee2452d 100644 --- a/core/includes/xmlrpcs.inc +++ b/core/includes/xmlrpcs.inc @@ -275,7 +275,7 @@ function xmlrpc_server_multicall($methodcalls) { if ($method == 'system.multicall') { $result = xmlrpc_error(-32600, t('Recursive calls to system.multicall are forbidden.')); } - elseif ($ok) { + else if ($ok) { $result = xmlrpc_server_call($xmlrpc_server, $method, $params); } if (is_object($result) && !empty($result->is_error)) { diff --git a/core/lib/Drupal/Component/Archiver/ArchiveTar.php b/core/lib/Drupal/Component/Archiver/ArchiveTar.php index f6ef506..b4c160c 100644 --- a/core/lib/Drupal/Component/Archiver/ArchiveTar.php +++ b/core/lib/Drupal/Component/Archiver/ArchiveTar.php @@ -119,7 +119,7 @@ class ArchiveTar // extends PEAR $this->_compress = true; $this->_compress_type = 'gz'; // No sure it's enought for a magic code .... - } elseif ($data == "BZ") { + } else if ($data == "BZ") { $this->_compress = true; $this->_compress_type = 'bz2'; } @@ -130,7 +130,7 @@ class ArchiveTar // extends PEAR if (substr($p_tarname, -2) == 'gz') { $this->_compress = true; $this->_compress_type = 'gz'; - } elseif ((substr($p_tarname, -3) == 'bz2') || + } else if ((substr($p_tarname, -3) == 'bz2') || (substr($p_tarname, -2) == 'bz')) { $this->_compress = true; $this->_compress_type = 'bz2'; @@ -188,11 +188,11 @@ class ArchiveTar // extends PEAR if (OS_WINDOWS) { $suffix = '.dll'; - } elseif (PHP_OS == 'HP-UX') { + } else if (PHP_OS == 'HP-UX') { $suffix = '.sl'; - } elseif (PHP_OS == 'AIX') { + } else if (PHP_OS == 'AIX') { $suffix = '.a'; - } elseif (PHP_OS == 'OSX') { + } else if (PHP_OS == 'OSX') { $suffix = '.bundle'; } else { $suffix = '.so'; @@ -337,7 +337,7 @@ class ArchiveTar // extends PEAR if ($p_filelist != '') { if (is_array($p_filelist)) $v_list = $p_filelist; - elseif (is_string($p_filelist)) + else if (is_string($p_filelist)) $v_list = explode($this->_separator, $p_filelist); else { $this->_cleanFile(); @@ -409,7 +409,7 @@ class ArchiveTar // extends PEAR else { if (is_array($p_filelist)) $v_list = $p_filelist; - elseif (is_string($p_filelist)) + else if (is_string($p_filelist)) $v_list = explode($this->_separator, $p_filelist); else { $this->_error('Invalid file list'); @@ -558,7 +558,7 @@ class ArchiveTar // extends PEAR if (is_array($p_filelist)) $v_list = $p_filelist; - elseif (is_string($p_filelist)) + else if (is_string($p_filelist)) $v_list = explode($this->_separator, $p_filelist); else { $this->_error('Invalid string list'); @@ -1079,7 +1079,7 @@ class ArchiveTar // extends PEAR $v_typeflag = '2'; $v_linkname = readlink($p_filename); $v_size = sprintf("%11s ", DecOct(0)); - } elseif (@is_dir($p_filename)) { + } else if (@is_dir($p_filename)) { $v_typeflag = "5"; $v_size = sprintf("%11s ", DecOct(0)); } else { @@ -1534,7 +1534,7 @@ class ArchiveTar // extends PEAR } // ----- It is a file, so compare the file names - elseif ($p_file_list[$i] == $v_header['filename']) { + else if ($p_file_list[$i] == $v_header['filename']) { $v_extract_file = TRUE; break; } @@ -1584,7 +1584,7 @@ class ArchiveTar // extends PEAR } // ----- Check the directory availability and create it if necessary - elseif (($v_result + else if (($v_result = $this->_dirCheck(($v_header['typeflag'] == "5" ?$v_header['filename'] :dirname($v_header['filename'])))) != 1) { @@ -1603,7 +1603,7 @@ class ArchiveTar // extends PEAR return false; } } - } elseif ($v_header['typeflag'] == "2") { + } else if ($v_header['typeflag'] == "2") { if (@file_exists($v_header['filename'])) { @drupal_unlink($v_header['filename']); } @@ -1701,7 +1701,7 @@ class ArchiveTar // extends PEAR if ($this->_compress_type == 'gz') $v_temp_tar = @gzopen($this->_tarname.".tmp", "rb"); - elseif ($this->_compress_type == 'bz2') + else if ($this->_compress_type == 'bz2') $v_temp_tar = @bzopen($this->_tarname.".tmp", "r"); if ($v_temp_tar == 0) { @@ -1730,7 +1730,7 @@ class ArchiveTar // extends PEAR @gzclose($v_temp_tar); } - elseif ($this->_compress_type == 'bz2') { + else if ($this->_compress_type == 'bz2') { while (strlen($v_buffer = @bzread($v_temp_tar, 512)) > 0) { if ($v_buffer == ARCHIVE_TAR_END_BLOCK) { continue; @@ -1763,7 +1763,7 @@ class ArchiveTar // extends PEAR if (fread($this->_file, 512) == ARCHIVE_TAR_END_BLOCK) { fseek($this->_file, $v_size - 1024); } - elseif (fread($this->_file, 512) == ARCHIVE_TAR_END_BLOCK) { + else if (fread($this->_file, 512) == ARCHIVE_TAR_END_BLOCK) { fseek($this->_file, $v_size - 512); } } diff --git a/core/lib/Drupal/Component/Uuid/Uuid.php b/core/lib/Drupal/Component/Uuid/Uuid.php index 68a73d1..77810f2 100644 --- a/core/lib/Drupal/Component/Uuid/Uuid.php +++ b/core/lib/Drupal/Component/Uuid/Uuid.php @@ -79,7 +79,7 @@ class Uuid { $plugin = 'Drupal\Component\Uuid\Pecl'; } // Try to use the COM implementation for Windows users. - elseif (function_exists('com_create_guid')) { + else if (function_exists('com_create_guid')) { $plugin = 'Drupal\Component\Uuid\Com'; } return $plugin; diff --git a/core/lib/Drupal/Core/Cache/DatabaseBackend.php b/core/lib/Drupal/Core/Cache/DatabaseBackend.php index 44a4111..55a5579 100644 --- a/core/lib/Drupal/Core/Cache/DatabaseBackend.php +++ b/core/lib/Drupal/Core/Cache/DatabaseBackend.php @@ -195,7 +195,7 @@ class DatabaseBackend implements CacheBackendInterface { // This is the first request to clear the cache, start a timer. variable_set('cache_flush_' . $this->bin, REQUEST_TIME); } - elseif (REQUEST_TIME > ($cache_flush + variable_get('cache_lifetime', 0))) { + else if (REQUEST_TIME > ($cache_flush + variable_get('cache_lifetime', 0))) { // Clear the cache for everyone; cache_lifetime seconds have passed // since the first request to clear the cache. db_delete($this->bin) diff --git a/core/lib/Drupal/Core/Database/Database.php b/core/lib/Drupal/Core/Database/Database.php index 298c011..f741474 100644 --- a/core/lib/Drupal/Core/Database/Database.php +++ b/core/lib/Drupal/Core/Database/Database.php @@ -228,7 +228,7 @@ abstract class Database { 'default' => '', ); } - elseif (!is_array($database_info[$index][$target]['prefix'])) { + else if (!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/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php b/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php index f5e493d..ad5c258 100644 --- a/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php +++ b/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php @@ -143,7 +143,7 @@ class Schema extends DatabaseSchema { if (in_array($spec['mysql_type'], array('VARCHAR', 'CHAR', 'TINYTEXT', 'MEDIUMTEXT', 'LONGTEXT', 'TEXT')) && isset($spec['length'])) { $sql .= '(' . $spec['length'] . ')'; } - elseif (isset($spec['precision']) && isset($spec['scale'])) { + else if (isset($spec['precision']) && isset($spec['scale'])) { $sql .= '(' . $spec['precision'] . ', ' . $spec['scale'] . ')'; } @@ -169,7 +169,7 @@ class Schema extends DatabaseSchema { if (is_string($spec['default'])) { $spec['default'] = "'" . $spec['default'] . "'"; } - elseif (!isset($spec['default'])) { + else if (!isset($spec['default'])) { $spec['default'] = 'NULL'; } $sql .= ' DEFAULT ' . $spec['default']; diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php index 129ca42..cc28ff7 100644 --- a/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php +++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php @@ -48,7 +48,7 @@ class Connection extends DatabaseConnection { // so backslashes in the password need to be doubled up. // The bug was reported against pdo_pgsql 1.0.2, backslashes in passwords // will break on this doubling up when the bug is fixed, so check the version - //elseif (phpversion('pdo_pgsql') < 'version_this_was_fixed_in') { + //else if (phpversion('pdo_pgsql') < 'version_this_was_fixed_in') { else { $connection_options['password'] = str_replace('\\', '\\\\', $connection_options['password']); } diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php index dffa1fd..793727b 100644 --- a/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php +++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php @@ -91,7 +91,7 @@ class Insert extends QueryInsert { $options['sequence_name'] = $table_information->sequences[0]; } // If there are no sequences then we can't get a last insert id. - elseif ($options['return'] == Database::RETURN_INSERT_ID) { + else if ($options['return'] == Database::RETURN_INSERT_ID) { $options['return'] = Database::RETURN_NULL; } // Only use the returned last_insert_id if it is not already set. diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php index 7206e17..4a71429 100644 --- a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php +++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php @@ -70,7 +70,7 @@ class Schema extends DatabaseSchema { if ($column->data_type == 'bytea') { $table_information->blob_fields[$column->column_name] = TRUE; } - elseif (preg_match("/nextval\('([^']+)'/", $column->column_default, $matches)) { + else if (preg_match("/nextval\('([^']+)'/", $column->column_default, $matches)) { // We must know of any sequences in the table structure to help us // return the last insert id. If there is more than 1 sequences the // first one (index 0 of the sequences array) will be used. @@ -194,7 +194,7 @@ class Schema extends DatabaseSchema { if (in_array($spec['pgsql_type'], array('varchar', 'character', 'text')) && isset($spec['length'])) { $sql .= '(' . $spec['length'] . ')'; } - elseif (isset($spec['precision']) && isset($spec['scale'])) { + else if (isset($spec['precision']) && isset($spec['scale'])) { $sql .= '(' . $spec['precision'] . ', ' . $spec['scale'] . ')'; } @@ -526,7 +526,7 @@ class Schema extends DatabaseSchema { if (in_array($spec['pgsql_type'], array('varchar', 'character', 'text')) && isset($spec['length'])) { $typecast .= '(' . $spec['length'] . ')'; } - elseif (isset($spec['precision']) && isset($spec['scale'])) { + else if (isset($spec['precision']) && isset($spec['scale'])) { $typecast .= '(' . $spec['precision'] . ', ' . $spec['scale'] . ')'; } diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php index 02a55a4..529f3b9 100644 --- a/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php +++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php @@ -373,7 +373,7 @@ class Connection extends DatabaseConnection { $this->willRollback = FALSE; PDO::rollBack(); } - elseif (!PDO::commit()) { + else if (!PDO::commit()) { throw new TransactionCommitFailedException(); } } diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Update.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Update.php index 18332e7..cd5d0a4 100644 --- a/core/lib/Drupal/Core/Database/Driver/sqlite/Update.php +++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Update.php @@ -61,7 +61,7 @@ class Update extends QueryUpdate { $condition->where($field . ' <> ' . $data['expression']); $condition->isNull($field); } - elseif (!isset($data)) { + else if (!isset($data)) { // The field will be set to NULL. $condition->isNotNull($field); } diff --git a/core/lib/Drupal/Core/Database/Query/Condition.php b/core/lib/Drupal/Core/Database/Query/Condition.php index f7d2a2f..0a1df1d 100644 --- a/core/lib/Drupal/Core/Database/Query/Condition.php +++ b/core/lib/Drupal/Core/Database/Query/Condition.php @@ -209,7 +209,7 @@ class Condition implements ConditionInterface, Countable { // We assume that if there is a delimiter, then the value is an // array. If not, it is a scalar. For simplicity, we first convert // up to an array so that we can build the placeholders in the same way. - elseif (!$operator['delimiter']) { + else if (!$operator['delimiter']) { $condition['value'] = array($condition['value']); } if ($operator['use_value']) { diff --git a/core/lib/Drupal/Core/Database/Transaction.php b/core/lib/Drupal/Core/Database/Transaction.php index 10adadb..3c47a95 100644 --- a/core/lib/Drupal/Core/Database/Transaction.php +++ b/core/lib/Drupal/Core/Database/Transaction.php @@ -59,7 +59,7 @@ class Transaction { } // Within transactions, savepoints are used. Each savepoint requires a // name. So if no name is present we need to create one. - elseif (!$name) { + else if (!$name) { $this->name = 'savepoint_' . $depth; } else { diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module index fec4f0b..7b26b88 100644 --- a/core/modules/aggregator/aggregator.module +++ b/core/modules/aggregator/aggregator.module @@ -461,7 +461,7 @@ function aggregator_save_category($edit) { $op = 'delete'; } } - elseif (!empty($edit['title'])) { + else if (!empty($edit['title'])) { // A single unique id for bundles and feeds, to use in blocks. $link_path .= db_insert('aggregator_category') ->fields(array( @@ -504,7 +504,7 @@ function aggregator_save_feed($edit) { )) ->execute(); } - elseif (!empty($edit['fid'])) { + else if (!empty($edit['fid'])) { $iids = db_query('SELECT iid FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $edit['fid']))->fetchCol(); if ($iids) { db_delete('aggregator_category_item') @@ -525,7 +525,7 @@ function aggregator_save_feed($edit) { ->execute(); } } - elseif (!empty($edit['title'])) { + else if (!empty($edit['title'])) { $edit['fid'] = db_insert('aggregator_feed') ->fields(array( 'title' => $edit['title'], diff --git a/core/modules/aggregator/aggregator.parser.inc b/core/modules/aggregator/aggregator.parser.inc index 0f594d4..44c5b7e 100644 --- a/core/modules/aggregator/aggregator.parser.inc +++ b/core/modules/aggregator/aggregator.parser.inc @@ -104,7 +104,7 @@ function aggregator_parse_feed(&$data, $feed) { if (!empty($item['title'])) { $item['title'] = $item['title']; } - elseif (!empty($item['description'])) { + else if (!empty($item['description'])) { $item['title'] = preg_replace('/^(.*)[^\w;&].*?$/', "\\1", truncate_utf8($item['description'], 40)); } else { @@ -128,10 +128,10 @@ function aggregator_parse_feed(&$data, $feed) { if (!empty($item['content:encoded'])) { $item['description'] = $item['content:encoded']; } - elseif (!empty($item['summary'])) { + else if (!empty($item['summary'])) { $item['description'] = $item['summary']; } - elseif (!empty($item['content'])) { + else if (!empty($item['content'])) { $item['description'] = $item['content']; } diff --git a/core/modules/aggregator/aggregator.processor.inc b/core/modules/aggregator/aggregator.processor.inc index 7fa86a9..c73d46c 100644 --- a/core/modules/aggregator/aggregator.processor.inc +++ b/core/modules/aggregator/aggregator.processor.inc @@ -28,7 +28,7 @@ function aggregator_aggregator_process($feed) { if (!empty($item['guid'])) { $entry = db_query("SELECT iid, timestamp FROM {aggregator_item} WHERE fid = :fid AND guid = :guid", array(':fid' => $feed->fid, ':guid' => $item['guid']))->fetchObject(); } - elseif ($item['link'] && $item['link'] != $feed->link && $item['link'] != $feed->url) { + else if ($item['link'] && $item['link'] != $feed->link && $item['link'] != $feed->url) { $entry = db_query("SELECT iid, timestamp FROM {aggregator_item} WHERE fid = :fid AND link = :link", array(':fid' => $feed->fid, ':link' => $item['link']))->fetchObject(); } else { @@ -163,7 +163,7 @@ function aggregator_save_item($edit) { ->condition('iid', $edit['iid']) ->execute(); } - elseif ($edit['title'] && $edit['link']) { + else if ($edit['title'] && $edit['link']) { // file the items in the categories indicated by the feed $result = db_query('SELECT cid FROM {aggregator_category_feed} WHERE fid = :fid', array(':fid' => $edit['fid'])); foreach ($result as $category) { diff --git a/core/modules/block/block.admin.inc b/core/modules/block/block.admin.inc index 8a5553d..928040e 100644 --- a/core/modules/block/block.admin.inc +++ b/core/modules/block/block.admin.inc @@ -324,7 +324,7 @@ function block_admin_configure($form, &$form_state, $module, $delta) { if ($key == $theme_default) { $theme_title = t('!theme (default theme)', array('!theme' => $theme_title)); } - elseif ($admin_theme && $key == $admin_theme) { + else if ($admin_theme && $key == $admin_theme) { $theme_title = t('!theme (administration theme)', array('!theme' => $theme_title)); } $form['regions'][$key] = array( diff --git a/core/modules/block/block.module b/core/modules/block/block.module index 25bd3b1..c620f26 100644 --- a/core/modules/block/block.module +++ b/core/modules/block/block.module @@ -842,7 +842,7 @@ function block_block_list_alter(&$blocks) { // pages listed in $block->pages. $page_match = !($block->visibility xor $page_match); } - elseif (module_exists('php')) { + else if (module_exists('php')) { $page_match = php_eval($block->pages); } else { @@ -887,7 +887,7 @@ function _block_get_renderable_block($element) { '#printed' => TRUE, ); } - elseif (isset($array) && is_array($array)) { + else if (isset($array) && is_array($array)) { foreach ($array as $k => $v) { $block->$k = $v; } diff --git a/core/modules/book/book.module b/core/modules/book/book.module index a6ac5c4..26ffb6f 100644 --- a/core/modules/book/book.module +++ b/core/modules/book/book.module @@ -307,7 +307,7 @@ function book_block_view($delta = '') { $book_menus['#theme'] = 'book_all_books_block'; } } - elseif ($current_bid) { + else if ($current_bid) { // Only display this block when the user is browsing a book. $select = db_select('node', 'n') ->fields('n', array('title')) @@ -498,7 +498,7 @@ function _book_parent_select($book_link) { $form['#prefix'] .= '' . t('This will be the top-level page in this book.') . ''; } } - elseif (!$book_link['bid']) { + else if (!$book_link['bid']) { $form['#prefix'] .= '' . t('No book selected.') . ''; } else { diff --git a/core/modules/color/color.module b/core/modules/color/color.module index b22a282..43e7eb4 100644 --- a/core/modules/color/color.module +++ b/core/modules/color/color.module @@ -465,7 +465,7 @@ function _color_rewrite_stylesheet($theme, &$info, &$paths, $palette, $style) { $base = 'link'; } // 'color:' styles. Use text. - elseif (preg_match('/(?status = COMMENT_NOT_PUBLISHED; } - elseif ($operation == 'publish') { + else if ($operation == 'publish') { $comment->status = COMMENT_PUBLISHED; } comment_save($comment); diff --git a/core/modules/comment/comment.entity.inc b/core/modules/comment/comment.entity.inc index 0c0ea0d..930d083 100644 --- a/core/modules/comment/comment.entity.inc +++ b/core/modules/comment/comment.entity.inc @@ -135,7 +135,7 @@ class CommentStorageController extends EntityDatabaseStorageController { // Allow calling code to set thread itself. $thread = $comment->thread; } - elseif ($comment->pid == 0) { + else if ($comment->pid == 0) { // This is a comment with no parent comment (depth 0): we start // by retrieving the maximum thread level. $max = db_query('SELECT MAX(thread) FROM {comment} WHERE nid = :nid', array(':nid' => $comment->nid))->fetchField(); diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module index 1a3580f..c102be7 100644 --- a/core/modules/comment/comment.module +++ b/core/modules/comment/comment.module @@ -560,7 +560,7 @@ function comment_new_page_count($num_comments, $new_replies, $node) { // Only one page of comments. $pageno = 0; } - elseif ($flat) { + else if ($flat) { // Flat comments. $count = $num_comments - $new_replies; $pageno = $count / $comments_per_page; @@ -640,7 +640,7 @@ function comment_node_view($node, $view_mode) { 'value' => url('node/' . $node->nid, array('fragment' => 'comments', 'absolute' => TRUE)) ); } - elseif ($view_mode == 'teaser') { + else if ($view_mode == 'teaser') { // Teaser view: display the number of comments that have been posted, // or a link to add new comments if the user has permission, the node // is open to new comments, and there currently are none. @@ -687,7 +687,7 @@ function comment_node_view($node, $view_mode) { } } } - elseif ($view_mode != 'search_index' && $view_mode != 'search_result') { + else if ($view_mode != 'search_index' && $view_mode != 'search_result') { // Node in other view modes: add a "post comment" link if the user is // allowed to post comments and if this node is allowing new comments. // But we don't want this link if we're building the node for search @@ -1084,7 +1084,7 @@ function comment_links($comment, $node) { ); } } - elseif (user_access('post comments')) { + else if (user_access('post comments')) { if (comment_access('edit', $comment)) { $links['comment-edit'] = array( 'title' => t('edit'), @@ -1757,7 +1757,7 @@ function comment_form($form, &$form_state, $comment) { '#autocomplete_path' => 'user/autocomplete', ); } - elseif ($user->uid) { + else if ($user->uid) { $form['author']['_author'] = array( '#type' => 'item', '#title' => t('Your name'), @@ -1902,7 +1902,7 @@ function comment_preview($comment) { if (!empty($comment->name)) { $account = user_load_by_name($comment->name); } - elseif ($user->uid && empty($comment->is_anonymous)) { + else if ($user->uid && empty($comment->is_anonymous)) { $account = $user; } @@ -1913,7 +1913,7 @@ function comment_preview($comment) { $comment->signature_format = $account->signature_format; $comment->picture = $account->picture; } - elseif (empty($comment->name)) { + else if (empty($comment->name)) { $comment->name = variable_get('anonymous', t('Anonymous')); } @@ -1965,7 +1965,7 @@ function comment_form_validate($form, &$form_state) { form_set_error('name', t('You have to specify a valid author.')); } } - elseif ($form_state['values']['is_anonymous']) { + else if ($form_state['values']['is_anonymous']) { // Validate anonymous comment author fields (if given). If the (original) // author of this comment was an anonymous user, verify that no registered // user with this name exists. diff --git a/core/modules/comment/comment.pages.inc b/core/modules/comment/comment.pages.inc index 344e757..5e503cb 100644 --- a/core/modules/comment/comment.pages.inc +++ b/core/modules/comment/comment.pages.inc @@ -77,7 +77,7 @@ function comment_reply($node, $pid = NULL) { } } // This is the case where the comment is in response to a node. Display the node. - elseif (user_access('access content')) { + else if (user_access('access content')) { $build['comment_node'] = node_view($node); } @@ -86,7 +86,7 @@ function comment_reply($node, $pid = NULL) { drupal_set_message(t("This discussion is closed: you can't post new comments."), 'error'); drupal_goto("node/$node->nid"); } - elseif (user_access('post comments')) { + else if (user_access('post comments')) { $comment = entity_create('comment', array('nid' => $node->nid, 'pid' => $pid)); $build['comment_form'] = drupal_get_form("comment_node_{$node->type}_form", $comment); } diff --git a/core/modules/comment/comment.tokens.inc b/core/modules/comment/comment.tokens.inc index 1c6a7ee..21b4ae2 100644 --- a/core/modules/comment/comment.tokens.inc +++ b/core/modules/comment/comment.tokens.inc @@ -223,7 +223,7 @@ function comment_tokens($type, $tokens, array $data = array(), array $options = $replacements += token_generate('user', $author_tokens, array('user' => $account), $options); } } - elseif ($type == 'node' & !empty($data['node'])) { + else if ($type == 'node' & !empty($data['node'])) { $node = $data['node']; foreach ($tokens as $name => $original) { diff --git a/core/modules/contextual/contextual.module b/core/modules/contextual/contextual.module index 844e9ee..d6954bc 100644 --- a/core/modules/contextual/contextual.module +++ b/core/modules/contextual/contextual.module @@ -93,7 +93,7 @@ function contextual_preprocess(&$variables, $hook) { $keys = array_keys($hooks[$hook]['variables']); $key = $keys[0]; } - elseif (!empty($hooks[$hook]['render element'])) { + else if (!empty($hooks[$hook]['render element'])) { $key = $hooks[$hook]['render element']; } if (!empty($key) && isset($variables[$key])) { diff --git a/core/modules/dashboard/dashboard.module b/core/modules/dashboard/dashboard.module index 889af83..3f4049a 100644 --- a/core/modules/dashboard/dashboard.module +++ b/core/modules/dashboard/dashboard.module @@ -356,7 +356,7 @@ function dashboard_form_block_admin_display_form_alter(&$form, &$form_state, $fo if (isset($block['region']['#default_value']) && isset($dashboard_regions[$block['region']['#default_value']]) && $block['region']['#default_value'] != 'dashboard_inactive') { $block['#access'] = FALSE; } - elseif (isset($block['region']['#options'])) { + else if (isset($block['region']['#options'])) { $block['region']['#options'] = array_diff_key($block['region']['#options'], $dashboard_regions); } // Show inactive dashboard blocks as disabled on the main block diff --git a/core/modules/entity/entity.class.inc b/core/modules/entity/entity.class.inc index 9b13256..0fa497f 100644 --- a/core/modules/entity/entity.class.inc +++ b/core/modules/entity/entity.class.inc @@ -208,7 +208,7 @@ class Entity implements EntityInterface { if (isset($this->entityInfo['label callback']) && function_exists($this->entityInfo['label callback'])) { $label = $this->entityInfo['label callback']($this->entityType, $this); } - elseif (!empty($this->entityInfo['entity keys']['label']) && isset($this->{$this->entityInfo['entity keys']['label']})) { + else if (!empty($this->entityInfo['entity keys']['label']) && isset($this->{$this->entityInfo['entity keys']['label']})) { $label = $this->{$this->entityInfo['entity keys']['label']}; } return $label; @@ -226,7 +226,7 @@ class Entity implements EntityInterface { if (isset($this->entityInfo['bundles'][$bundle]['uri callback'])) { $uri_callback = $this->entityInfo['bundles'][$bundle]['uri callback']; } - elseif (isset($this->entityInfo['uri callback'])) { + else if (isset($this->entityInfo['uri callback'])) { $uri_callback = $this->entityInfo['uri callback']; } else { diff --git a/core/modules/entity/entity.controller.inc b/core/modules/entity/entity.controller.inc index 04c1f31..a18c424 100644 --- a/core/modules/entity/entity.controller.inc +++ b/core/modules/entity/entity.controller.inc @@ -270,7 +270,7 @@ class DrupalDefaultEntityController implements DrupalEntityControllerInterface { if ($revision_id) { $query->join($this->revisionTable, 'revision', "revision.{$this->idKey} = base.{$this->idKey} AND revision.{$this->revisionKey} = :revisionId", array(':revisionId' => $revision_id)); } - elseif ($this->revisionKey) { + else if ($this->revisionKey) { $query->join($this->revisionTable, 'revision', "revision.{$this->revisionKey} = base.{$this->revisionKey}"); } @@ -369,7 +369,7 @@ class DrupalDefaultEntityController implements DrupalEntityControllerInterface { } // If loading entities only by conditions, fetch all available entities // from the cache. Entities which don't match are removed later. - elseif ($conditions) { + else if ($conditions) { $entities = $this->entityCache; } } diff --git a/core/modules/entity/entity.module b/core/modules/entity/entity.module index fe9a6e5..e453452 100644 --- a/core/modules/entity/entity.module +++ b/core/modules/entity/entity.module @@ -107,7 +107,7 @@ function entity_get_info($entity_type = NULL) { if (empty($entity_type)) { return $entity_info; } - elseif (isset($entity_info[$entity_type])) { + else if (isset($entity_info[$entity_type])) { return $entity_info[$entity_type]; } } @@ -366,7 +366,7 @@ function entity_uri($entity_type, $entity) { if (isset($info['bundles'][$bundle]['uri callback'])) { $uri_callback = $info['bundles'][$bundle]['uri callback']; } - elseif (isset($info['uri callback'])) { + else if (isset($info['uri callback'])) { $uri_callback = $info['uri callback']; } else { @@ -407,7 +407,7 @@ function entity_label($entity_type, $entity) { if (isset($info['label callback'])) { $label = $info['label callback']($entity_type, $entity); } - elseif (!empty($info['entity keys']['label']) && isset($entity->{$info['entity keys']['label']})) { + else if (!empty($info['entity keys']['label']) && isset($entity->{$info['entity keys']['label']})) { $label = $entity->{$info['entity keys']['label']}; } diff --git a/core/modules/entity/entity.query.inc b/core/modules/entity/entity.query.inc index fb7ebf0..5415fcd 100644 --- a/core/modules/entity/entity.query.inc +++ b/core/modules/entity/entity.query.inc @@ -578,7 +578,7 @@ class EntityFieldQuery { if (!isset($element)) { $element = PagerDefault::$maxElement++; } - elseif ($element >= PagerDefault::$maxElement) { + else if ($element >= PagerDefault::$maxElement) { PagerDefault::$maxElement = $element + 1; } @@ -773,7 +773,7 @@ class EntityFieldQuery { if (!isset($storage)) { $storage = $field['storage']['module']; } - elseif ($storage != $field['storage']['module']) { + else if ($storage != $field['storage']['module']) { throw new EntityFieldQueryException(t("Can't handle more than one field storage engine")); } } @@ -862,7 +862,7 @@ class EntityFieldQuery { } $select_query->orderBy($id_map[$key], $order['direction']); } - elseif ($order['type'] == 'property') { + else if ($order['type'] == 'property') { $select_query->orderBy("$base_table." . $order['specifier'], $order['direction']); } } diff --git a/core/modules/field/field.api.php b/core/modules/field/field.api.php index 774d8b5..091760b 100644 --- a/core/modules/field/field.api.php +++ b/core/modules/field/field.api.php @@ -1978,14 +1978,14 @@ function hook_field_storage_query($query) { $key = $order['specifier']; $select_query->orderBy("$field_base_table.$key", $order['direction']); } - elseif ($order['type'] == 'field') { + else if ($order['type'] == 'field') { $specifier = $order['specifier']; $field = $specifier['field']; $table_alias = $table_aliases[$specifier['index']]; $sql_field = "$table_alias." . _field_sql_storage_columnname($field['field_name'], $specifier['column']); $select_query->orderBy($sql_field, $order['direction']); } - elseif ($order['type'] == 'property') { + else if ($order['type'] == 'property') { $select_query->orderBy("$entity_base_table." . $order['specifier'], $order['direction']); } } diff --git a/core/modules/field/field.attach.inc b/core/modules/field/field.attach.inc index 34826cb..b78f29f 100644 --- a/core/modules/field/field.attach.inc +++ b/core/modules/field/field.attach.inc @@ -431,7 +431,7 @@ function _field_invoke_get_instances($entity_type, $bundle, $options) { } $instances = field_read_instances($params, array('include_deleted' => TRUE)); } - elseif (isset($options['field_name'])) { + else if (isset($options['field_name'])) { // Single-field mode by field name: field_info_instance() does the // filtering. $instances = array(field_info_instance($entity_type, $options['field_name'], $bundle)); diff --git a/core/modules/field/field.info.inc b/core/modules/field/field.info.inc index 78bc62e..cb4ec19 100644 --- a/core/modules/field/field.info.inc +++ b/core/modules/field/field.info.inc @@ -695,7 +695,7 @@ function field_info_instances($entity_type = NULL, $bundle_name = NULL) { if (isset($entity_type) && isset($bundle_name)) { return isset($info['instances'][$entity_type][$bundle_name]) ? $info['instances'][$entity_type][$bundle_name] : array(); } - elseif (isset($entity_type)) { + else if (isset($entity_type)) { return isset($info['instances'][$entity_type]) ? $info['instances'][$entity_type] : array(); } else { @@ -806,7 +806,7 @@ function field_info_max_weight($entity_type, $bundle, $context) { if ($context == 'form') { $weights[] = $instance['widget']['weight']; } - elseif (isset($instance['display'][$context]['weight'])) { + else if (isset($instance['display'][$context]['weight'])) { $weights[] = $instance['display'][$context]['weight']; } } diff --git a/core/modules/field/field.module b/core/modules/field/field.module index 1ea128b..384b53d 100644 --- a/core/modules/field/field.module +++ b/core/modules/field/field.module @@ -475,7 +475,7 @@ function field_get_default_value($entity_type, $entity, $field, $instance, $lang $function = $instance['default_value_function']; $items = $function($entity_type, $entity, $field, $instance, $langcode); } - elseif (!empty($instance['default_value'])) { + else if (!empty($instance['default_value'])) { $items = $instance['default_value']; } return $items; @@ -728,7 +728,7 @@ function _field_extra_fields_pre_render($elements) { } } } - elseif (isset($elements['#view_mode'])) { + else if (isset($elements['#view_mode'])) { $view_mode = $elements['#view_mode']; $extra_fields = field_extra_fields_get_display($entity_type, $bundle, $view_mode); foreach ($extra_fields as $name => $settings) { diff --git a/core/modules/field/field.multilingual.inc b/core/modules/field/field.multilingual.inc index a4f5f8f..0aa930e 100644 --- a/core/modules/field/field.multilingual.inc +++ b/core/modules/field/field.multilingual.inc @@ -214,7 +214,7 @@ function field_has_translation_handler($entity_type, $handler = NULL) { if (isset($handler)) { return !empty($entity_info['translation'][$handler]); } - elseif (isset($entity_info['translation'])) { + else if (isset($entity_info['translation'])) { foreach ($entity_info['translation'] as $handler_info) { // The translation handler must use a non-empty data structure. if (!empty($handler_info)) { diff --git a/core/modules/field/modules/field_sql_storage/field_sql_storage.module b/core/modules/field/modules/field_sql_storage/field_sql_storage.module index adc50bd..876b943 100644 --- a/core/modules/field/modules/field_sql_storage/field_sql_storage.module +++ b/core/modules/field/modules/field_sql_storage/field_sql_storage.module @@ -565,14 +565,14 @@ function field_sql_storage_field_storage_query(EntityFieldQuery $query) { $key = $order['specifier']; $select_query->orderBy("$field_base_table.$key", $order['direction']); } - elseif ($order['type'] == 'field') { + else if ($order['type'] == 'field') { $specifier = $order['specifier']; $field = $specifier['field']; $table_alias = $table_aliases[$specifier['index']]; $sql_field = "$table_alias." . _field_sql_storage_columnname($field['field_name'], $specifier['column']); $select_query->orderBy($sql_field, $order['direction']); } - elseif ($order['type'] == 'property') { + else if ($order['type'] == 'property') { $select_query->orderBy("$entity_base_table." . $order['specifier'], $order['direction']); } } diff --git a/core/modules/field/modules/list/list.module b/core/modules/field/modules/list/list.module index c2bff2a..2ee4b4f 100644 --- a/core/modules/field/modules/list/list.module +++ b/core/modules/field/modules/list/list.module @@ -135,7 +135,7 @@ function list_field_settings_form($field, $instance, $has_data) { if ($instance['widget']['type'] == 'options_onoff') { $form['allowed_values']['#description'] .= '

' . t("For a 'single on/off checkbox' widget, define the 'off' value first, then the 'on' value in the Allowed values section. Note that the checkbox will be labeled with the label of the 'on' value.") . '

'; } - elseif ($instance['widget']['type'] == 'options_buttons') { + else if ($instance['widget']['type'] == 'options_buttons') { $form['allowed_values']['#description'] .= '

' . t("The 'checkboxes/radio buttons' widget will display checkboxes if the Number of values option is greater than 1 for this field, otherwise radios will be displayed.") . '

'; } $form['allowed_values']['#description'] .= '

' . t('Allowed HTML tags in labels: @tags', array('@tags' => _field_filter_xss_display_allowed_tags())) . '

'; @@ -179,7 +179,7 @@ function list_allowed_values_setting_validate($element, &$form_state) { form_error($element, t('Allowed values list: each key must be a valid integer or decimal.')); break; } - elseif ($field_type == 'list_text' && drupal_strlen($key) > 255) { + else if ($field_type == 'list_text' && drupal_strlen($key) > 255) { form_error($element, t('Allowed values list: each key must be a string at most 255 characters long.')); break; } @@ -282,14 +282,14 @@ function list_extract_allowed_values($string, $field_type, $generate_keys) { } // Otherwise see if we can use the value as the key. Detecting true integer // strings takes a little trick. - elseif ($field_type == 'list_text' + else if ($field_type == 'list_text' || ($field_type == 'list_float' && is_numeric($text)) || ($field_type == 'list_integer' && is_numeric($text) && (float) $text == intval($text))) { $key = $value = $text; $explicit_keys = TRUE; } // Otherwise see if we can generate a key from the position. - elseif ($generate_keys) { + else if ($generate_keys) { $key = (string) $position; $value = $text; $generated_keys = TRUE; diff --git a/core/modules/field/tests/field.test b/core/modules/field/tests/field.test index 3566484..cc54a98 100644 --- a/core/modules/field/tests/field.test +++ b/core/modules/field/tests/field.test @@ -2826,7 +2826,7 @@ class FieldTranslationsTestCase extends FieldTestCase { } // Ensure that a language for which there is no field translation is // used as display language to prepare per-entity language suggestions. - elseif (!isset($display_language)) { + else if (!isset($display_language)) { $display_language = $langcode; } } diff --git a/core/modules/field_ui/field_ui.admin.inc b/core/modules/field_ui/field_ui.admin.inc index c22fe21..89a0bd8 100644 --- a/core/modules/field_ui/field_ui.admin.inc +++ b/core/modules/field_ui/field_ui.admin.inc @@ -708,7 +708,7 @@ function _field_ui_field_overview_form_validate_add_new($form, &$form_state) { form_set_error('fields][_add_new_field][widget_type', t('Add new field: you need to select a widget.')); } // Wrong widget type. - elseif ($field['type']) { + else if ($field['type']) { $widget_types = field_ui_widget_type_options($field['type']); if (!isset($widget_types[$field['widget_type']])) { form_set_error('fields][_add_new_field][widget_type', t('Add new field: invalid widget.')); @@ -763,7 +763,7 @@ function _field_ui_field_overview_form_validate_add_existing($form, &$form_state form_set_error('fields][_add_existing_field][widget_type', t('Add existing field: you need to select a widget.')); } // Wrong widget type. - elseif ($field['field_name'] && ($existing_field = field_info_field($field['field_name']))) { + else if ($field['field_name'] && ($existing_field = field_info_field($field['field_name']))) { $widget_types = field_ui_widget_type_options($existing_field['type']); if (!isset($widget_types[$field['widget_type']])) { form_set_error('fields][_add_existing_field][widget_type', t('Add existing field: invalid widget.')); @@ -793,7 +793,7 @@ function field_ui_field_overview_form_submit($form, &$form_state) { $instance['widget']['weight'] = $values['weight']; field_update_instance($instance); } - elseif (in_array($key, $form['#extra'])) { + else if (in_array($key, $form['#extra'])) { $bundle_settings['extra_fields']['form'][$key]['weight'] = $values['weight']; } } @@ -1338,10 +1338,10 @@ function field_ui_display_overview_form_submit($form, &$form_state) { if (isset($values['settings_edit_form']['settings'])) { $settings = $values['settings_edit_form']['settings']; } - elseif (isset($form_state['formatter_settings'][$field_name])) { + else if (isset($form_state['formatter_settings'][$field_name])) { $settings = $form_state['formatter_settings'][$field_name]; } - elseif (isset($instance['display'][$view_mode]['settings'])) { + else if (isset($instance['display'][$view_mode]['settings'])) { $settings = $instance['display'][$view_mode]['settings']; } diff --git a/core/modules/file/file.field.inc b/core/modules/file/file.field.inc index a46ed1a..21b7e63 100644 --- a/core/modules/file/file.field.inc +++ b/core/modules/file/file.field.inc @@ -956,13 +956,13 @@ function theme_file_upload_help($variables) { if ($min && $max && $min == $max) { $descriptions[] = t('Images must be exactly !size pixels.', array('!size' => '' . $max . '')); } - elseif ($min && $max) { + else if ($min && $max) { $descriptions[] = t('Images must be between !min and !max pixels.', array('!min' => '' . $min . '', '!max' => '' . $max . '')); } - elseif ($min) { + else if ($min) { $descriptions[] = t('Images must be larger than !min pixels.', array('!min' => '' . $min . '')); } - elseif ($max) { + else if ($max) { $descriptions[] = t('Images must be smaller than !max pixels.', array('!max' => '' . $max . '')); } } diff --git a/core/modules/file/file.install b/core/modules/file/file.install index dff930b..6c81a04 100644 --- a/core/modules/file/file.install +++ b/core/modules/file/file.install @@ -62,27 +62,27 @@ function file_requirements($phase) { $description = t('Your server is not capable of displaying file upload progress. File upload progress requires an Apache server running PHP with mod_php.'); $severity = REQUIREMENT_INFO; } - elseif ($fastcgi) { + else if ($fastcgi) { $value = t('Not enabled'); $description = t('Your server is not capable of displaying file upload progress. File upload progress requires PHP be run with mod_php and not as FastCGI.'); $severity = REQUIREMENT_INFO; } - elseif (!$implementation && extension_loaded('apc')) { + else if (!$implementation && extension_loaded('apc')) { $value = t('Not enabled'); $description = t('Your server is capable of displaying file upload progress through APC, but it is not enabled. Add apc.rfc1867 = 1 to your php.ini configuration. Alternatively, it is recommended to use PECL uploadprogress, which supports more than one simultaneous upload.'); $severity = REQUIREMENT_INFO; } - elseif (!$implementation) { + else if (!$implementation) { $value = t('Not enabled'); $description = t('Your server is capable of displaying file upload progress, but does not have the required libraries. It is recommended to install the PECL uploadprogress library (preferred) or to install APC.'); $severity = REQUIREMENT_INFO; } - elseif ($implementation == 'apc') { + else if ($implementation == 'apc') { $value = t('Enabled (APC RFC1867)'); $description = t('Your server is capable of displaying file upload progress using APC RFC1867. Note that only one upload at a time is supported. It is recommended to use the PECL uploadprogress library if possible.'); $severity = REQUIREMENT_OK; } - elseif ($implementation == 'uploadprogress') { + else if ($implementation == 'uploadprogress') { $value = t('Enabled (PECL uploadprogress)'); $severity = REQUIREMENT_OK; } diff --git a/core/modules/file/file.module b/core/modules/file/file.module index a2a5a80..b7c06e8 100644 --- a/core/modules/file/file.module +++ b/core/modules/file/file.module @@ -308,7 +308,7 @@ function file_ajax_progress($key) { $progress['percentage'] = round(100 * $status['bytes_uploaded'] / $status['bytes_total']); } } - elseif ($implementation == 'apc') { + else if ($implementation == 'apc') { $status = apc_fetch('upload_' . $key); if (isset($status['current']) && !empty($status['total'])) { $progress['message'] = t('Uploading... (@current of @total)', array('@current' => format_size($status['current']), '@total' => format_size($status['total']))); @@ -336,7 +336,7 @@ function file_progress_implementation() { if (extension_loaded('uploadprogress')) { $implementation = 'uploadprogress'; } - elseif (extension_loaded('apc') && ini_get('apc.rfc1867')) { + else if (extension_loaded('apc') && ini_get('apc.rfc1867')) { $implementation = 'apc'; } } @@ -423,7 +423,7 @@ function file_managed_file_process($element, &$form_state, $form) { '#weight' => -20, ); } - elseif ($implementation == 'apc') { + else if ($implementation == 'apc') { $element['APC_UPLOAD_PROGRESS'] = array( '#type' => 'hidden', '#value' => $upload_progress_key, @@ -492,7 +492,7 @@ function file_managed_file_value(&$element, $input = FALSE, $form_state = NULL) if ($element['#extended'] && isset($form_state_fid['fid'])) { $fid = $form_state_fid['fid']; } - elseif (is_numeric($form_state_fid)) { + else if (is_numeric($form_state_fid)) { $fid = $form_state_fid; } diff --git a/core/modules/filter/filter.admin.inc b/core/modules/filter/filter.admin.inc index 40a5eab..e79f869 100644 --- a/core/modules/filter/filter.admin.inc +++ b/core/modules/filter/filter.admin.inc @@ -154,7 +154,7 @@ function filter_admin_format_form($form, &$form_state, $format) { // If editing an existing text format, pre-select its current permissions. $form['roles']['#default_value'] = array_keys(filter_get_roles_by_format($format)); } - elseif ($admin_role = variable_get('user_admin_role', 0)) { + else if ($admin_role = variable_get('user_admin_role', 0)) { // If adding a new text format and the site has an administrative role, // pre-select that role so as to grant administrators access to the new // text format permission by default. diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module index 5fe4caa..21f64f7 100644 --- a/core/modules/filter/filter.module +++ b/core/modules/filter/filter.module @@ -903,7 +903,7 @@ function filter_process_format($element) { // Disable this widget, if the user is not allowed to use the stored format, // or if the stored format does not exist. The 'administer filters' permission // only grants access to the filter administration, not to all formats. - elseif (!$user_has_access || !$format_exists) { + else if (!$user_has_access || !$format_exists) { // Overload default values into #value to make them unalterable. $element['value']['#value'] = $element['value']['#default_value']; $element['format']['format']['#value'] = $element['format']['format']['#default_value']; @@ -1631,12 +1631,12 @@ function _filter_autop($text) { } } // Only allow a matching tag to close it. - elseif (!$open && $ignoretag == $tag) { + else if (!$open && $ignoretag == $tag) { $ignore = FALSE; $ignoretag = ''; } } - elseif (!$ignore) { + else if (!$ignore) { $chunk = preg_replace('|\n*$|', '', $chunk) . "\n\n"; // just to make things a little easier, pad the end $chunk = preg_replace('|
\s*
|', "\n\n", $chunk); $chunk = preg_replace('!(<' . $block . '[^>]*>)!', "\n$1", $chunk); // Space things out a little diff --git a/core/modules/forum/forum.admin.inc b/core/modules/forum/forum.admin.inc index 55a4238..56e3850 100644 --- a/core/modules/forum/forum.admin.inc +++ b/core/modules/forum/forum.admin.inc @@ -306,7 +306,7 @@ function _forum_parent_select($tid, $title, $child_type) { if ($child_type == 'container') { $description = t('Containers are usually placed at the top (root) level, but may also be placed inside another container or forum.'); } - elseif ($child_type == 'forum') { + else if ($child_type == 'forum') { $description = t('Forums may be placed at the top (root) level, or inside another container or forum.'); } diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module index 4c12c41..378ff79 100644 --- a/core/modules/forum/forum.module +++ b/core/modules/forum/forum.module @@ -590,7 +590,7 @@ function forum_form_alter(&$form, $form_state, $form_id) { $form['delete']['#access'] = FALSE; } // Hide multiple parents select from forum terms. - elseif ($form_id == 'taxonomy_form_term') { + else if ($form_id == 'taxonomy_form_term') { $form['advanced']['parent']['#access'] = FALSE; } } @@ -753,7 +753,7 @@ function forum_forum_load($tid = NULL) { } } // If $tid is 0, create an empty object to hold the child terms. - elseif ($tid === 0) { + else if ($tid === 0) { $forum_term = (object) array( 'tid' => 0, ); @@ -1032,7 +1032,7 @@ function template_preprocess_forums(&$variables) { $variables['theme_hook_suggestions'][] = 'forums__' . $variables['tid']; $variables['theme_hook_suggestions'][] = 'forums__containers__' . $variables['tid']; } - elseif (!$variables['forums'] && $variables['topics']) { + else if (!$variables['forums'] && $variables['topics']) { $variables['theme_hook_suggestions'][] = 'forums__topics'; $variables['theme_hook_suggestions'][] = 'forums__' . $variables['tid']; $variables['theme_hook_suggestions'][] = 'forums__topics__' . $variables['tid']; diff --git a/core/modules/image/image.field.inc b/core/modules/image/image.field.inc index aef6be7..84c0547 100644 --- a/core/modules/image/image.field.inc +++ b/core/modules/image/image.field.inc @@ -541,7 +541,7 @@ function image_field_formatter_view($entity_type, $entity, $field, $instance, $l if ($display['settings']['image_link'] == 'content') { $uri = entity_uri($entity_type, $entity); } - elseif ($display['settings']['image_link'] == 'file') { + else if ($display['settings']['image_link'] == 'file') { $link_file = TRUE; } diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module index 6d3ded0..13ac1fb 100644 --- a/core/modules/locale/locale.module +++ b/core/modules/locale/locale.module @@ -383,7 +383,7 @@ function locale_field_language_fallback(&$display_language, $entity, $langcode) if (isset($entity->{$field_name}[$langcode])) { $display_language[$field_name] = $langcode; } - elseif (!empty($entity->{$field_name})) { + else if (!empty($entity->{$field_name})) { if (!isset($fallback_candidates)) { require_once DRUPAL_ROOT . '/core/includes/language.inc'; $fallback_candidates = language_fallback_get_candidates(); @@ -648,7 +648,7 @@ function locale($string = NULL, $context = NULL, $langcode = NULL) { if ($cache = cache()->get('locale:' . $langcode)) { $locale_t[$langcode] = $cache->data; } - elseif (lock_acquire('locale_cache_' . $langcode)) { + else if (lock_acquire('locale_cache_' . $langcode)) { // Refresh database stored cache of translations for given language. // We only store short strings used in current version, to improve // performance and consume less memory. @@ -756,7 +756,7 @@ function locale_get_plural($count, $langcode = NULL) { } // In case there is no plural formula for English (no imported translation // for English), use a default formula. - elseif ($langcode == 'en') { + else if ($langcode == 'en') { $plural_indexes[$langcode][$count] = (int) ($count != 1); } // Otherwise, return -1 (unknown). @@ -860,7 +860,7 @@ function locale_js_alter(&$javascript) { } // If no refresh was attempted, but we have new source files, we need // to store them too. This occurs if current page is in English. - elseif ($new_files) { + else if ($new_files) { variable_set('javascript_parsed', $parsed); } diff --git a/core/modules/locale/locale.pages.inc b/core/modules/locale/locale.pages.inc index 3df2832..7140935 100644 --- a/core/modules/locale/locale.pages.inc +++ b/core/modules/locale/locale.pages.inc @@ -454,7 +454,7 @@ function locale_translate_edit_form_submit($form, &$form_state) { ->execute(); } } - elseif (!empty($translation)) { + else if (!empty($translation)) { // Empty translation entered: remove existing entry from database. db_delete('locales_target') ->condition('lid', $lid) diff --git a/core/modules/menu/menu.admin.inc b/core/modules/menu/menu.admin.inc index 2e1725d..a3d0a06 100644 --- a/core/modules/menu/menu.admin.inc +++ b/core/modules/menu/menu.admin.inc @@ -129,7 +129,7 @@ function _menu_overview_tree_form($tree) { $operations['delete'] = array('#type' => 'link', '#title' => t('delete'), '#href' => 'admin/structure/menu/item/' . $item['mlid'] . '/delete'); } // Set the reset column. - elseif ($item['module'] == 'system' && $item['customized']) { + else if ($item['module'] == 'system' && $item['customized']) { $operations['reset'] = array('#type' => 'link', '#title' => t('reset'), '#href' => 'admin/structure/menu/item/' . $item['mlid'] . '/reset'); } $form[$mlid]['operations'] = $operations; diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module index 6862eae..a3262bc 100644 --- a/core/modules/menu/menu.module +++ b/core/modules/menu/menu.module @@ -531,7 +531,7 @@ function menu_node_save($node) { menu_link_delete($link['mlid']); } } - elseif (trim($link['link_title'])) { + else if (trim($link['link_title'])) { $link['link_title'] = trim($link['link_title']); $link['link_path'] = "node/$node->nid"; if (trim($link['description'])) { diff --git a/core/modules/node/content_types.inc b/core/modules/node/content_types.inc index 2e45c9a..cdb2677 100644 --- a/core/modules/node/content_types.inc +++ b/core/modules/node/content_types.inc @@ -361,7 +361,7 @@ function node_type_form_submit($form, &$form_state) { if ($status == SAVED_UPDATED) { drupal_set_message(t('The content type %name has been updated.', $t_args)); } - elseif ($status == SAVED_NEW) { + else if ($status == SAVED_NEW) { node_add_body_field($type); drupal_set_message(t('The content type %name has been added.', $t_args)); watchdog('node', 'Added content type %name.', $t_args, WATCHDOG_NOTICE, l(t('view'), 'admin/structure/types')); diff --git a/core/modules/node/node.admin.inc b/core/modules/node/node.admin.inc index ac18da7..51c546f 100644 --- a/core/modules/node/node.admin.inc +++ b/core/modules/node/node.admin.inc @@ -172,7 +172,7 @@ function node_filter_form() { $value = module_invoke('taxonomy', 'term_load', $value); $value = $value->name; } - elseif ($type == 'language') { + else if ($type == 'language') { $value = language_name($value); } else { @@ -524,7 +524,7 @@ function node_admin_nodes() { ), ); } - elseif (!empty($operations)) { + else if (!empty($operations)) { // Render the first and only operation as a link. $link = reset($operations); $options[$node->nid]['operations'] = array( diff --git a/core/modules/node/node.module b/core/modules/node/node.module index be60e48..b4b5046 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -368,7 +368,7 @@ function node_mark($nid, $timestamp) { if ($cache[$nid] == 0 && $timestamp > NODE_NEW_LIMIT) { return MARK_NEW; } - elseif ($timestamp > $cache[$nid] && $timestamp > NODE_NEW_LIMIT) { + else if ($timestamp > $cache[$nid] && $timestamp > NODE_NEW_LIMIT) { return MARK_UPDATED; } return MARK_READ; @@ -1106,7 +1106,7 @@ function node_save($node) { $node->log = ''; } } - elseif (!isset($node->log) || $node->log === '') { + else if (!isset($node->log) || $node->log === '') { // If we are updating an existing node without adding a new revision, we // need to make sure $node->log is unset whenever it is empty. As long as // $node->log is unset, drupal_write_record() will not attempt to update @@ -1960,7 +1960,7 @@ function _node_revision_access($node, $op = 'view', $account = NULL) { if ($is_current_revision && (db_query('SELECT COUNT(vid) FROM {node_revision} WHERE nid = :nid', array(':nid' => $node->nid))->fetchField() == 1 || $op == 'update' || $op == 'delete')) { $access[$cid] = FALSE; } - elseif (user_access('administer nodes', $account)) { + else if (user_access('administer nodes', $account)) { $access[$cid] = TRUE; } else { @@ -2553,7 +2553,7 @@ function node_block_list_alter(&$blocks) { continue; } } - elseif (isset($node_add_arg) && isset($node_types[$node_add_arg])) { + else if (isset($node_add_arg) && isset($node_types[$node_add_arg])) { // This is a node creation page if (!isset($block_node_types[$block->module][$block->delta][$node_add_arg])) { // This block should not be displayed for this node type. @@ -3054,7 +3054,7 @@ function node_access($op, $node, $account = NULL) { $rights[$account->uid][$cid][$op] = FALSE; return FALSE; } - elseif (in_array(NODE_ACCESS_ALLOW, $access, TRUE)) { + else if (in_array(NODE_ACCESS_ALLOW, $access, TRUE)) { $rights[$account->uid][$cid][$op] = TRUE; return TRUE; } @@ -3097,7 +3097,7 @@ function node_access($op, $node, $account = NULL) { $rights[$account->uid][$cid][$op] = $result; return $result; } - elseif (is_object($node) && $op == 'view' && $node->status) { + else if (is_object($node) && $op == 'view' && $node->status) { // If no modules implement hook_node_grants(), the default behaviour is to // allow all users to view published nodes, so reflect that here. $rights[$account->uid][$cid][$op] = TRUE; @@ -3580,7 +3580,7 @@ function node_access_needs_rebuild($rebuild = NULL) { if (!isset($rebuild)) { return variable_get('node_access_needs_rebuild', FALSE); } - elseif ($rebuild) { + else if ($rebuild) { variable_set('node_access_needs_rebuild', TRUE); } else { diff --git a/core/modules/node/node.pages.inc b/core/modules/node/node.pages.inc index 4e94b26..2896f31 100644 --- a/core/modules/node/node.pages.inc +++ b/core/modules/node/node.pages.inc @@ -414,7 +414,7 @@ function node_preview($node) { $node->uid = 0; // anonymous user } } - elseif ($node->uid) { + else if ($node->uid) { $user = user_load($node->uid); $node->name = $user->name; $node->picture = $user->picture; diff --git a/core/modules/node/tests/node_test.module b/core/modules/node/tests/node_test.module index b0ebc14..73ea992 100644 --- a/core/modules/node/tests/node_test.module +++ b/core/modules/node/tests/node_test.module @@ -83,7 +83,7 @@ function node_test_node_access_records($node) { 'priority' => 0, ); } - elseif ($node->type == 'page') { + else if ($node->type == 'page') { // Create grant in arbitrary page_realm for page nodes. $grants[] = array( 'realm' => 'test_page_realm', diff --git a/core/modules/openid/openid.inc b/core/modules/openid/openid.inc index 518dc8a..8ce6c53 100644 --- a/core/modules/openid/openid.inc +++ b/core/modules/openid/openid.inc @@ -150,7 +150,7 @@ function _openid_xrds_parse($raw_xml) { if ($service_element->children(OPENID_NS_XRD)->LocalID) { $service['identity'] = (string)$service_element->children(OPENID_NS_XRD)->LocalID; } - elseif ($service_element->children(OPENID_NS_OPENID)->Delegate) { + else if ($service_element->children(OPENID_NS_OPENID)->Delegate) { $service['identity'] = (string)$service_element->children(OPENID_NS_OPENID)->Delegate; } else { @@ -195,11 +195,11 @@ function _openid_select_service(array $services) { $service['version'] = 2; $type_priority = 1; } - elseif (in_array('http://specs.openid.net/auth/2.0/signon', $service['types'])) { + else if (in_array('http://specs.openid.net/auth/2.0/signon', $service['types'])) { $service['version'] = 2; $type_priority = 2; } - elseif (in_array(OPENID_NS_1_0, $service['types']) || in_array(OPENID_NS_1_1, $service['types'])) { + else if (in_array(OPENID_NS_1_0, $service['types']) || in_array(OPENID_NS_1_1, $service['types'])) { $service['version'] = 1; $type_priority = 3; } @@ -682,7 +682,7 @@ function openid_extract_ax_values($values, $uris) { $output[] = $values['value.' . $alias . '.' . $i]; } } - elseif (isset($values['value.' . $alias])) { + else if (isset($values['value.' . $alias])) { $output[] = $values['value.' . $alias]; } break; @@ -703,7 +703,7 @@ function _openid_get_math_library() { if (function_exists('gmp_add')) { $library = 'gmp'; } - elseif (function_exists('bcadd')) { + else if (function_exists('bcadd')) { $library = 'bcmath'; } } diff --git a/core/modules/openid/openid.install b/core/modules/openid/openid.install index 830f990..99fb7a7 100644 --- a/core/modules/openid/openid.install +++ b/core/modules/openid/openid.install @@ -98,7 +98,7 @@ function openid_requirements($phase) { 'description' => t('OpenID suggests the use of either the GMP Math (recommended for performance) or BC Math libraries to enable OpenID associations.', array('@gmp' => 'http://php.net/manual/book.gmp.php', '@bc' => 'http://www.php.net/manual/book.bc.php')), ); } - elseif (!function_exists('gmp_add')) { + else if (!function_exists('gmp_add')) { $requirements['openid_math'] = array( 'value' => t('Not optimized'), 'severity' => REQUIREMENT_WARNING, diff --git a/core/modules/openid/openid.module b/core/modules/openid/openid.module index a3df38f..bd0f4cb 100644 --- a/core/modules/openid/openid.module +++ b/core/modules/openid/openid.module @@ -199,7 +199,7 @@ function openid_form_user_register_form_alter(&$form, &$form_state) { // Use the nickname returned by Simple Registration if available. $form['account']['name']['#default_value'] = $sreg_values['nickname']; } - elseif ($ax_name_values = openid_extract_ax_values($ax_values, array('http://axschema.org/namePerson/friendly', 'http://schema.openid.net/namePerson/friendly'))) { + else if ($ax_name_values = openid_extract_ax_values($ax_values, array('http://axschema.org/namePerson/friendly', 'http://schema.openid.net/namePerson/friendly'))) { // Else, use the first nickname returned by AX if available. $form['account']['name']['#default_value'] = current($ax_name_values); } @@ -211,7 +211,7 @@ function openid_form_user_register_form_alter(&$form, &$form_state) { // Use the email returned by Simple Registration if available. $form['account']['mail']['#default_value'] = $sreg_values['email']; } - elseif ($ax_mail_values = openid_extract_ax_values($ax_values, array('http://axschema.org/contact/email', 'http://schema.openid.net/contact/email'))) { + else if ($ax_mail_values = openid_extract_ax_values($ax_values, array('http://axschema.org/contact/email', 'http://schema.openid.net/contact/email'))) { // Else, use the first nickname returned by AX if available. $form['account']['mail']['#default_value'] = current($ax_mail_values); } @@ -227,7 +227,7 @@ function openid_form_user_register_form_alter(&$form, &$form_state) { if (!empty($sreg_values['timezone'])) { $timezone = $sreg_values['timezone']; } - elseif ($ax_timezone_values = openid_extract_ax_values($ax_values, array('http://axschema.org/pref/timezone', 'http://openid.net/schema/timezone'))) { + else if ($ax_timezone_values = openid_extract_ax_values($ax_values, array('http://axschema.org/pref/timezone', 'http://openid.net/schema/timezone'))) { $timezone = current($ax_timezone_values); } if (in_array($timezone, timezone_identifiers_list())) { @@ -238,7 +238,7 @@ function openid_form_user_register_form_alter(&$form, &$form_state) { if (!empty($sreg_values['language'])) { $language = $sreg_values['language']; } - elseif ($ax_language_values = openid_extract_ax_values($ax_values, array('http://axschema.org/pref/language', 'http://openid.net/schema/language/pref'))) { + else if ($ax_language_values = openid_extract_ax_values($ax_values, array('http://axschema.org/pref/language', 'http://openid.net/schema/language/pref'))) { $language = current($ax_language_values); } if ($language) { @@ -405,7 +405,7 @@ function openid_complete($response = array()) { if (!empty($service['claimed_id'])) { $response['openid.claimed_id'] = $service['claimed_id']; } - elseif ($service['version'] == 2) { + else if ($service['version'] == 2) { // Returned Claimed Identifier could contain unique fragment // identifier to allow identifier recycling so we need to preserve // it in the response. @@ -721,7 +721,7 @@ function openid_authentication($response) { // Let other modules act on OpenID login module_invoke_all('openid_response', $response, $account); } - elseif (variable_get('user_register', USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL)) { + else if (variable_get('user_register', USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL)) { // Register new user. // Save response for use in openid_form_user_register_form_alter(). diff --git a/core/modules/openid/tests/openid_test.module b/core/modules/openid/tests/openid_test.module index 5bd2f4d..d2229bf 100644 --- a/core/modules/openid/tests/openid_test.module +++ b/core/modules/openid/tests/openid_test.module @@ -148,7 +148,7 @@ function openid_test_yadis_xrds() { ' . url('openid-test/endpoint', array('absolute' => TRUE)) . ' '; } - elseif (arg(3) == 'delegate') { + else if (arg(3) == 'delegate') { print ' http://specs.openid.net/auth/2.0/signon diff --git a/core/modules/overlay/overlay.module b/core/modules/overlay/overlay.module index 58dcbab..8caa293 100644 --- a/core/modules/overlay/overlay.module +++ b/core/modules/overlay/overlay.module @@ -142,7 +142,7 @@ function overlay_init() { } // If this page shouldn't be rendered inside the overlay, redirect to the // parent. - elseif (!path_is_admin($current_path)) { + else if (!path_is_admin($current_path)) { overlay_close_dialog($current_path, array('query' => drupal_get_query_parameters(NULL, array('q', 'render')))); } @@ -153,7 +153,7 @@ function overlay_init() { unset($_GET['render']); } // Do not enable the overlay if we already are on an admin page. - elseif (!path_is_admin($current_path)) { + else if (!path_is_admin($current_path)) { // Otherwise add overlay parent code and our behavior. overlay_set_mode('parent'); } @@ -293,7 +293,7 @@ function overlay_page_alter(&$page) { // Add the overlay wrapper before the html wrapper. array_unshift($page['#theme_wrappers'], 'overlay'); } - elseif ($mode == 'parent' && ($message = overlay_disable_message())) { + else if ($mode == 'parent' && ($message = overlay_disable_message())) { $page['page_top']['disable_overlay'] = $message; } } diff --git a/core/modules/poll/poll.module b/core/modules/poll/poll.module index 154db55..c1dc861 100644 --- a/core/modules/poll/poll.module +++ b/core/modules/poll/poll.module @@ -495,7 +495,7 @@ function poll_load($nodes) { $poll->allowvotes = TRUE; } } - elseif (!empty($_SESSION['poll_vote'][$node->nid])) { + else if (!empty($_SESSION['poll_vote'][$node->nid])) { // Otherwise the user is anonymous. Look for an existing vote in the // user's session. $poll->vote = $_SESSION['poll_vote'][$node->nid]; diff --git a/core/modules/rdf/rdf.test b/core/modules/rdf/rdf.test index 6c7635f..e0950c5 100644 --- a/core/modules/rdf/rdf.test +++ b/core/modules/rdf/rdf.test @@ -650,7 +650,7 @@ class RdfTrackerAttributesTestCase extends DrupalWebTestCase { if ($node->uid == 0) { $this->assertTrue(empty($tracker_user), t('No about attribute is present on @user.', array('@user'=> $user))); } - elseif ($node->uid > 0) { + else if ($node->uid > 0) { $this->assertTrue(!empty($tracker_user), t('About attribute is present on @user.', array('@user'=> $user))); } diff --git a/core/modules/search/search.extender.inc b/core/modules/search/search.extender.inc index 73f7836..382623f 100644 --- a/core/modules/search/search.extender.inc +++ b/core/modules/search/search.extender.inc @@ -227,7 +227,7 @@ class SearchQuery extends SelectExtender { } // OR operator: instead of a single keyword, we store an array of all // OR'd keywords. - elseif ($match[2] == 'OR' && count($this->keys['positive'])) { + else if ($match[2] == 'OR' && count($this->keys['positive'])) { $last = array_pop($this->keys['positive']); // Starting a new OR? if (!is_array($last)) { @@ -239,7 +239,7 @@ class SearchQuery extends SelectExtender { continue; } // AND operator: implied, so just ignore it. - elseif ($match[2] == 'AND' || $match[2] == 'and') { + else if ($match[2] == 'AND' || $match[2] == 'and') { $warning = $match[2]; continue; } diff --git a/core/modules/search/search.module b/core/modules/search/search.module index 587ef43..45c44e7 100644 --- a/core/modules/search/search.module +++ b/core/modules/search/search.module @@ -756,7 +756,7 @@ function search_index($sid, $module, $text) { // Unset the link to mark it as processed. unset($links[$nid]); } - elseif ($sid != $nid || $module != 'node') { + else if ($sid != $nid || $module != 'node') { // Insert the existing link and mark the node for reindexing, but don't // reindex if this is a link in a node pointing to itself. db_insert('search_node_links') diff --git a/core/modules/simpletest/drupal_web_test_case.php b/core/modules/simpletest/drupal_web_test_case.php index a2d85cb..3042459 100644 --- a/core/modules/simpletest/drupal_web_test_case.php +++ b/core/modules/simpletest/drupal_web_test_case.php @@ -2118,7 +2118,7 @@ class DrupalWebTestCase extends DrupalTestCase { // @todo Ajax commands can target any jQuery selector, but these are // hard to fully emulate with XPath. For now, just handle 'head' // and 'body', since these are used by ajax_render(). - elseif (in_array($command['selector'], array('head', 'body'))) { + else if (in_array($command['selector'], array('head', 'body'))) { $wrapperNode = $xpath->query('//' . $command['selector'])->item(0); } if ($wrapperNode) { @@ -3084,7 +3084,7 @@ class DrupalWebTestCase extends DrupalTestCase { // Input element with correct value. $found = TRUE; } - elseif (isset($field->option)) { + else if (isset($field->option)) { // Select element found. if ($this->getSelectedItem($field) == $value) { $found = TRUE; @@ -3097,7 +3097,7 @@ class DrupalWebTestCase extends DrupalTestCase { } } } - elseif ((string) $field == $value) { + else if ((string) $field == $value) { // Text area with correct text. $found = TRUE; } @@ -3120,7 +3120,7 @@ class DrupalWebTestCase extends DrupalTestCase { if (isset($item['selected'])) { return $item['value']; } - elseif ($item->getName() == 'optgroup') { + else if ($item->getName() == 'optgroup') { if ($value = $this->getSelectedItem($item)) { return $value; } diff --git a/core/modules/simpletest/simpletest.pages.inc b/core/modules/simpletest/simpletest.pages.inc index 8ac1ee2..6dd73d5 100644 --- a/core/modules/simpletest/simpletest.pages.inc +++ b/core/modules/simpletest/simpletest.pages.inc @@ -343,7 +343,7 @@ function simpletest_result_form_submit($form, &$form_state) { if ($form_state['values']['filter'] == 'all') { $classes = array_merge($pass, $fail); } - elseif ($form_state['values']['filter'] == 'pass') { + else if ($form_state['values']['filter'] == 'pass') { $classes = $pass; } else { diff --git a/core/modules/simpletest/tests/common_test.module b/core/modules/simpletest/tests/common_test.module index 187fee5..9b09506 100644 --- a/core/modules/simpletest/tests/common_test.module +++ b/core/modules/simpletest/tests/common_test.module @@ -130,7 +130,7 @@ function common_test_drupal_alter_alter(&$data, &$arg2 = NULL, &$arg3 = NULL) { if (is_array($data)) { $data['foo'] = 'Drupal'; } - elseif (is_object($data)) { + else if (is_object($data)) { $data->foo = 'Drupal'; } // Alter second argument, if present. @@ -138,7 +138,7 @@ function common_test_drupal_alter_alter(&$data, &$arg2 = NULL, &$arg3 = NULL) { if (is_array($arg2)) { $arg2['foo'] = 'Drupal'; } - elseif (is_object($arg2)) { + else if (is_object($arg2)) { $arg2->foo = 'Drupal'; } } @@ -147,7 +147,7 @@ function common_test_drupal_alter_alter(&$data, &$arg2 = NULL, &$arg3 = NULL) { if (is_array($arg3)) { $arg3['foo'] = 'Drupal'; } - elseif (is_object($arg3)) { + else if (is_object($arg3)) { $arg3->foo = 'Drupal'; } } @@ -164,7 +164,7 @@ function bartik_drupal_alter_alter(&$data, &$arg2 = NULL, &$arg3 = NULL) { if (is_array($data)) { $data['foo'] .= ' theme'; } - elseif (is_object($data)) { + else if (is_object($data)) { $data->foo .= ' theme'; } // Alter second argument, if present. @@ -172,7 +172,7 @@ function bartik_drupal_alter_alter(&$data, &$arg2 = NULL, &$arg3 = NULL) { if (is_array($arg2)) { $arg2['foo'] .= ' theme'; } - elseif (is_object($arg2)) { + else if (is_object($arg2)) { $arg2->foo .= ' theme'; } } @@ -181,7 +181,7 @@ function bartik_drupal_alter_alter(&$data, &$arg2 = NULL, &$arg3 = NULL) { if (is_array($arg3)) { $arg3['foo'] .= ' theme'; } - elseif (is_object($arg3)) { + else if (is_object($arg3)) { $arg3->foo .= ' theme'; } } diff --git a/core/modules/simpletest/tests/file.test b/core/modules/simpletest/tests/file.test index c5eced1..e4a8c9b 100644 --- a/core/modules/simpletest/tests/file.test +++ b/core/modules/simpletest/tests/file.test @@ -304,7 +304,7 @@ class FileHookTestCase extends FileTestCase { if ($actual_count == $expected_count) { $message = t('hook_file_@name was called correctly.', array('@name' => $hook)); } - elseif ($expected_count == 0) { + else if ($expected_count == 0) { $message = format_plural($actual_count, 'hook_file_@name was not expected to be called but was actually called once.', 'hook_file_@name was not expected to be called but was actually called @count times.', array('@name' => $hook, '@count' => $actual_count)); } else { diff --git a/core/modules/simpletest/tests/file_test.module b/core/modules/simpletest/tests/file_test.module index 8a9a84a..60cc183 100644 --- a/core/modules/simpletest/tests/file_test.module +++ b/core/modules/simpletest/tests/file_test.module @@ -119,7 +119,7 @@ function _file_test_form_submit(&$form, &$form_state) { if ($form_state['values']['allow_all_extensions']) { $validators['file_validate_extensions'] = array(); } - elseif (!empty($form_state['values']['extensions'])) { + else if (!empty($form_state['values']['extensions'])) { $validators['file_validate_extensions'] = array($form_state['values']['extensions']); } @@ -131,7 +131,7 @@ function _file_test_form_submit(&$form, &$form_state) { drupal_set_message(t('File MIME type is @mimetype.', array('@mimetype' => $file->filemime))); drupal_set_message(t('You WIN!')); } - elseif ($file === FALSE) { + else if ($file === FALSE) { drupal_set_message(t('Epic upload FAIL!'), 'error'); } } @@ -322,7 +322,7 @@ function file_test_file_url_alter(&$uri) { return; } // Test alteration of file URLs to use a CDN. - elseif ($alter_mode == 'cdn') { + else if ($alter_mode == 'cdn') { $cdn_extensions = array('css', 'js', 'gif', 'jpg', 'jpeg', 'png'); // Most CDNs don't support private file transfers without a lot of hassle, @@ -358,7 +358,7 @@ function file_test_file_url_alter(&$uri) { } } // Test alteration of file URLs to use root-relative URLs. - elseif ($alter_mode == 'root-relative') { + else if ($alter_mode == 'root-relative') { // Only serve shipped files and public created files with root-relative // URLs. $scheme = file_uri_scheme($uri); @@ -381,7 +381,7 @@ function file_test_file_url_alter(&$uri) { } } // Test alteration of file URLs to use protocol-relative URLs. - elseif ($alter_mode == 'protocol-relative') { + else if ($alter_mode == 'protocol-relative') { // Only serve shipped files and public created files with protocol-relative // URLs. $scheme = file_uri_scheme($uri); diff --git a/core/modules/simpletest/tests/form.test b/core/modules/simpletest/tests/form.test index e79983c..569444f 100644 --- a/core/modules/simpletest/tests/form.test +++ b/core/modules/simpletest/tests/form.test @@ -1701,19 +1701,19 @@ class FormCheckboxTestCase extends DrupalWebTestCase { if ($default_value === TRUE) { $checked = TRUE; } - elseif ($return_value === '0') { + else if ($return_value === '0') { $checked = ($default_value === '0'); } - elseif ($return_value === '') { + else if ($return_value === '') { $checked = ($default_value === ''); } - elseif ($return_value === 1 || $return_value === '1') { + else if ($return_value === 1 || $return_value === '1') { $checked = ($default_value === 1 || $default_value === '1'); } - elseif ($return_value === 'foobar') { + else if ($return_value === 'foobar') { $checked = ($default_value === 'foobar'); } - elseif ($return_value === '1foobar') { + else if ($return_value === '1foobar') { $checked = ($default_value === '1foobar'); } $checked_in_html = strpos($form, 'checked') !== FALSE; diff --git a/core/modules/simpletest/tests/form_test.module b/core/modules/simpletest/tests/form_test.module index 3dcd247..9bcdb9c 100644 --- a/core/modules/simpletest/tests/form_test.module +++ b/core/modules/simpletest/tests/form_test.module @@ -338,7 +338,7 @@ function form_test_element_validate_name(&$element, &$form_state) { $triggered = TRUE; } - elseif (!empty($form_state['storage']['form_test_name'])) { + else if (!empty($form_state['storage']['form_test_name'])) { // To simplify this test, just take over the element's value into $form_state. form_set_value($element, $form_state['storage']['form_test_name'], $form_state); @@ -1687,10 +1687,10 @@ function form_test_clicked_button($form, &$form_state) { if (strpos($arg, 's') !== FALSE) { $type = 'submit'; } - elseif (strpos($arg, 'b') !== FALSE) { + else if (strpos($arg, 'b') !== FALSE) { $type = 'button'; } - elseif (strpos($arg, 'i') !== FALSE) { + else if (strpos($arg, 'i') !== FALSE) { $type = 'image_button'; } else { diff --git a/core/modules/simpletest/tests/menu_test.module b/core/modules/simpletest/tests/menu_test.module index 0b954ae..ffc25cd 100644 --- a/core/modules/simpletest/tests/menu_test.module +++ b/core/modules/simpletest/tests/menu_test.module @@ -443,11 +443,11 @@ function menu_test_theme_callback($argument) { return variable_get('admin_theme'); } // Test using a theme that exists, but may or may not be enabled. - elseif ($argument == 'use-stark-theme') { + else if ($argument == 'use-stark-theme') { return 'stark'; } // Test using a theme that does not exist. - elseif ($argument == 'use-fake-theme') { + else if ($argument == 'use-fake-theme') { return 'fake_theme'; } // For any other value of the URL argument, do not return anything. This diff --git a/core/modules/simpletest/tests/module_test.module b/core/modules/simpletest/tests/module_test.module index dd5930a..817b6cb 100644 --- a/core/modules/simpletest/tests/module_test.module +++ b/core/modules/simpletest/tests/module_test.module @@ -20,31 +20,31 @@ function module_test_system_info_alter(&$info, $file, $type) { // Make forum module depend on poll. $info['dependencies'][] = 'poll'; } - elseif ($file->name == 'poll') { + else if ($file->name == 'poll') { // Make poll depend on a made-up module. $info['dependencies'][] = 'foo'; } } - elseif (variable_get('dependency_test', FALSE) == 'dependency') { + else if (variable_get('dependency_test', FALSE) == 'dependency') { if ($file->name == 'forum') { // Make the forum module depend on poll. $info['dependencies'][] = 'poll'; } - elseif ($file->name == 'poll') { + else if ($file->name == 'poll') { // Make poll depend on php module. $info['dependencies'][] = 'php'; } } - elseif (variable_get('dependency_test', FALSE) == 'version dependency') { + else if (variable_get('dependency_test', FALSE) == 'version dependency') { if ($file->name == 'forum') { // Make the forum module depend on poll. $info['dependencies'][] = 'poll'; } - elseif ($file->name == 'poll') { + else if ($file->name == 'poll') { // Make poll depend on a specific version of php module. $info['dependencies'][] = 'php (1.x)'; } - elseif ($file->name == 'php') { + else if ($file->name == 'php') { // Set php module to a version compatible with the above. $info['version'] = '8.x-1.0'; } diff --git a/core/modules/simpletest/tests/system_test.module b/core/modules/simpletest/tests/system_test.module index e6d1f35..74c835f 100644 --- a/core/modules/simpletest/tests/system_test.module +++ b/core/modules/simpletest/tests/system_test.module @@ -315,11 +315,11 @@ function system_test_page_build(&$page) { $page['footer'] = drupal_set_page_content(); $page['footer']['main']['#markup'] = '
' . $page['footer']['main']['#markup'] . '
'; } - elseif ($menu_item['path'] == 'system-test/main-content-fallback') { + else if ($menu_item['path'] == 'system-test/main-content-fallback') { drupal_set_page_content(); $main_content_display = FALSE; } - elseif ($menu_item['path'] == 'system-test/main-content-duplication') { + else if ($menu_item['path'] == 'system-test/main-content-duplication') { drupal_set_page_content(); } } diff --git a/core/modules/statistics/statistics.tokens.inc b/core/modules/statistics/statistics.tokens.inc index c2c8fc3..a08f19d 100644 --- a/core/modules/statistics/statistics.tokens.inc +++ b/core/modules/statistics/statistics.tokens.inc @@ -43,11 +43,11 @@ function statistics_tokens($type, $tokens, array $data = array(), array $options $statistics = statistics_get($node->nid); $replacements[$original] = $statistics['totalcount']; } - elseif ($name == 'day-count') { + else if ($name == 'day-count') { $statistics = statistics_get($node->nid); $replacements[$original] = $statistics['daycount']; } - elseif ($name == 'last-view') { + else if ($name == 'last-view') { $statistics = statistics_get($node->nid); $replacements[$original] = format_date($statistics['timestamp']); } diff --git a/core/modules/system/image.gd.inc b/core/modules/system/image.gd.inc index 39f86dc..8cf5e40 100644 --- a/core/modules/system/image.gd.inc +++ b/core/modules/system/image.gd.inc @@ -315,7 +315,7 @@ function image_gd_create_tmp(stdClass $image, $width, $height) { imagecolortransparent($res, $transparent); } } - elseif ($image->info['extension'] == 'png') { + else if ($image->info['extension'] == 'png') { imagealphablending($res, FALSE); $transparency = imagecolorallocatealpha($res, 0, 0, 0, 127); imagefill($res, 0, 0, $transparency); diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc index 978b0f4..d6a1a75 100644 --- a/core/modules/system/system.admin.inc +++ b/core/modules/system/system.admin.inc @@ -509,7 +509,7 @@ function system_theme_settings($form, &$form_state, $key = '') { if ($original_path && isset($friendly_path)) { $local_file = strtr($original_path, array('public:/' => variable_get('file_public_path', conf_path() . '/files'))); } - elseif ($key) { + else if ($key) { $local_file = drupal_get_path('theme', $key) . '/' . $default; } else { @@ -812,7 +812,7 @@ function system_modules($form, $form_state = array()) { $extra['disabled'] = TRUE; } // Only display visible modules. - elseif (isset($visible_files[$requires])) { + else if (isset($visible_files[$requires])) { $requires_name = $files[$requires]->info['name']; // Disable this module if it is incompatible with the dependency's version. if ($incompatible_version = drupal_check_incompatibility($v, str_replace(DRUPAL_CORE_COMPATIBILITY . '-', '', $files[$requires]->info['version']))) { @@ -824,13 +824,13 @@ function system_modules($form, $form_state = array()) { } // Disable this module if the dependency is incompatible with this // version of Drupal core. - elseif ($files[$requires]->info['core'] != DRUPAL_CORE_COMPATIBILITY) { + else if ($files[$requires]->info['core'] != DRUPAL_CORE_COMPATIBILITY) { $extra['requires'][$requires] = t('@module (incompatible with this version of Drupal core)', array( '@module' => $requires_name, )); $extra['disabled'] = TRUE; } - elseif ($files[$requires]->status) { + else if ($files[$requires]->status) { $extra['requires'][$requires] = t('@module (enabled)', array('@module' => $requires_name)); } else { @@ -1171,11 +1171,11 @@ function system_modules_submit($form, &$form_state) { $actions['install'][] = $name; $actions['enable'][] = $name; } - elseif (!module_exists($name)) { + else if (!module_exists($name)) { $actions['enable'][] = $name; } } - elseif (module_exists($name)) { + else if (module_exists($name)) { $actions['disable'][] = $name; } } @@ -1410,10 +1410,10 @@ function system_ip_blocking_form_validate($form, &$form_state) { if (db_query("SELECT * FROM {blocked_ips} WHERE ip = :ip", array(':ip' => $ip))->fetchField()) { form_set_error('ip', t('This IP address is already blocked.')); } - elseif ($ip == ip_address()) { + else if ($ip == ip_address()) { form_set_error('ip', t('You may not block your own IP address.')); } - elseif (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE) == FALSE) { + else if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE) == FALSE) { form_set_error('ip', t('Enter a valid IP address.')); } } @@ -2005,7 +2005,7 @@ function system_date_time_settings() { if (empty($formats)) { $formats = $all_formats; } - elseif (!empty($custom_formats)) { + else if (!empty($custom_formats)) { $formats = array_merge($formats, $custom_formats); } } @@ -2243,7 +2243,7 @@ function system_clean_url_settings($form, &$form_state) { } } // If the user started the clean URL test, provide explicit feedback. - elseif (isset($form_state['input']['clean_url_test_execute'])) { + else if (isset($form_state['input']['clean_url_test_execute'])) { drupal_set_message(t('The clean URL test failed.'), 'warning'); } } @@ -2358,7 +2358,7 @@ function system_batch_page() { if ($output === FALSE) { drupal_access_denied(); } - elseif (isset($output)) { + else if (isset($output)) { // Force a page without blocks or messages to // display a list of collected messages later. drupal_set_page_content($output); @@ -2734,7 +2734,7 @@ function theme_system_themes_page($variables) { if (!empty($theme->incompatible_core)) { $output .= '
' . t('This version is not compatible with Drupal !core_version and should be replaced.', array('!core_version' => DRUPAL_CORE_COMPATIBILITY)) . '
'; } - elseif (!empty($theme->incompatible_php)) { + else if (!empty($theme->incompatible_php)) { if (substr_count($theme->info['php'], '.') < 2) { $theme->info['php'] .= '.*'; } diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php index 00c75c7..69ac264 100644 --- a/core/modules/system/system.api.php +++ b/core/modules/system/system.api.php @@ -3674,7 +3674,7 @@ function hook_date_formats_alter(&$formats) { * if ($set) { * $stored_callback = $callback; * } - * elseif (isset($stored_callback)) { + * else if (isset($stored_callback)) { * $callback = $stored_callback; * } * } diff --git a/core/modules/system/system.install b/core/modules/system/system.install index 905d11d..2b9a50e 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -206,10 +206,10 @@ function system_requirements($phase) { if ($phase == 'install') { $description = $t('Consider increasing your PHP memory limit to %memory_minimum_limit to help prevent errors in the installation process.', array('%memory_minimum_limit' => DRUPAL_MINIMUM_PHP_MEMORY_LIMIT)); } - elseif ($phase == 'update') { + else if ($phase == 'update') { $description = $t('Consider increasing your PHP memory limit to %memory_minimum_limit to help prevent errors in the update process.', array('%memory_minimum_limit' => DRUPAL_MINIMUM_PHP_MEMORY_LIMIT)); } - elseif ($phase == 'runtime') { + else if ($phase == 'runtime') { $description = $t('Depending on your configuration, Drupal can run with a %memory_limit PHP memory limit. However, a %memory_minimum_limit PHP memory limit or above is recommended, especially if your site uses additional custom or contributed modules.', array('%memory_limit' => $memory_limit, '%memory_minimum_limit' => DRUPAL_MINIMUM_PHP_MEMORY_LIMIT)); } @@ -271,7 +271,7 @@ function system_requirements($phase) { if (REQUEST_TIME - $cron_last > $threshold_error) { $severity = REQUIREMENT_ERROR; } - elseif (REQUEST_TIME - $cron_last > $threshold_warning) { + else if (REQUEST_TIME - $cron_last > $threshold_warning) { $severity = REQUIREMENT_WARNING; } @@ -344,7 +344,7 @@ function system_requirements($phase) { if ($phase == 'runtime') { $description = $error . $t('You may need to set the correct directory at the file system settings page or change the current directory\'s permissions so that it is writable.', array('@admin-file-system' => url('admin/config/media/file-system'))); } - elseif ($phase == 'install') { + else if ($phase == 'install') { // For the installer UI, we need different wording. 'value' will // be treated as version, so provide none there. $description = $error . $t('An automated attempt to create this directory failed, possibly due to a permissions problem. To proceed with the installation, either create the directory and modify its permissions manually or ensure that the installer has the permissions to create it automatically. For more information, see INSTALL.txt or the online handbook.', array('@handbook_url' => 'http://drupal.org/server-permissions')); diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 98e32e8..ad58d0c 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -2223,7 +2223,7 @@ function system_check_directory($form_element) { form_set_error($form_element['#parents'][0], t('The directory %directory exists but is not writable and could not be made writable.', array('%directory' => $directory))); watchdog('file system', 'The directory %directory exists but is not writable and could not be made writable.', array('%directory' => $directory), WATCHDOG_ERROR); } - elseif (is_dir($directory)) { + else if (is_dir($directory)) { if ($form_element['#name'] == 'file_public_path') { // Create public .htaccess file. file_save_htaccess($directory, FALSE); @@ -2864,7 +2864,7 @@ function confirm_form($form, $question, $path, $description = NULL, $yes = NULL, if (isset($_GET['destination'])) { $options = drupal_parse_url(urldecode($_GET['destination'])); } - elseif (is_array($path)) { + else if (is_array($path)) { $options = $path; } else { @@ -3672,7 +3672,7 @@ function system_date_format_locale($langcode = NULL, $type = NULL) { if ($type && $langcode && !empty($formats[$langcode][$type])) { return $formats[$langcode][$type]; } - elseif ($langcode && !empty($formats[$langcode])) { + else if ($langcode && !empty($formats[$langcode])) { return $formats[$langcode]; } diff --git a/core/modules/system/system.test b/core/modules/system/system.test index 9287d16..888d682 100644 --- a/core/modules/system/system.test +++ b/core/modules/system/system.test @@ -1685,11 +1685,11 @@ class SystemThemeFunctionalTest extends DrupalWebTestCase { $local_file = strtr($input, array('public:/' => variable_get('file_public_path', conf_path() . '/files'))); } // Adjust for fully qualified stream wrapper URI elsewhere. - elseif (file_uri_scheme($input) !== FALSE) { + else if (file_uri_scheme($input) !== FALSE) { $explicit_file = $input; } // Adjust for relative path within public filesystem. - elseif ($input == file_uri_target($file->uri)) { + else if ($input == file_uri_target($file->uri)) { $implicit_public_file = $input; $explicit_file = 'public://' . $input; $local_file = variable_get('file_public_path', conf_path() . '/files') . '/' . $input; diff --git a/core/modules/system/system.tokens.inc b/core/modules/system/system.tokens.inc index 2492890..c078ba9 100644 --- a/core/modules/system/system.tokens.inc +++ b/core/modules/system/system.tokens.inc @@ -173,7 +173,7 @@ function system_tokens($type, $tokens, array $data = array(), array $options = a } } - elseif ($type == 'date') { + else if ($type == 'date') { if (empty($data['date'])) { $date = REQUEST_TIME; } @@ -212,7 +212,7 @@ function system_tokens($type, $tokens, array $data = array(), array $options = a } } - elseif ($type == 'file' && !empty($data['file'])) { + else if ($type == 'file' && !empty($data['file'])) { $file = $data['file']; foreach ($tokens as $name => $original) { diff --git a/core/modules/taxonomy/taxonomy.admin.inc b/core/modules/taxonomy/taxonomy.admin.inc index beb87f9..96e2325 100644 --- a/core/modules/taxonomy/taxonomy.admin.inc +++ b/core/modules/taxonomy/taxonomy.admin.inc @@ -36,7 +36,7 @@ function taxonomy_overview_vocabularies($form) { $form['actions'] = array('#type' => 'actions'); $form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Save')); } - elseif (isset($vocabulary)) { + else if (isset($vocabulary)) { unset($form[$vocabulary->vid]['weight']); } return $form; @@ -294,7 +294,7 @@ function taxonomy_overview_terms($form, &$form_state, $vocabulary) { continue; } // Count entries after the current page. - elseif ($page_entries > $page_increment && isset($complete_tree)) { + else if ($page_entries > $page_increment && isset($complete_tree)) { $after_entries++; continue; } @@ -496,7 +496,7 @@ function taxonomy_overview_terms_submit($form, &$form_state) { $changed_terms[$term['tid']] = $term; } // Terms not at the root level can safely start from 0 because they're all on this page. - elseif ($values['parent'] > 0) { + else if ($values['parent'] > 0) { $level_weights[$values['parent']] = isset($level_weights[$values['parent']]) ? $level_weights[$values['parent']] + 1 : 0; if ($level_weights[$values['parent']] != $term['weight']) { $term['weight'] = $level_weights[$values['parent']]; @@ -615,7 +615,7 @@ function theme_taxonomy_overview_terms($variables) { if ($row_position == $back_step - 1 || $row_position == $page_entries - $forward_step - 1) { $rows[$key]['class'][] = 'taxonomy-term-divider-top'; } - elseif ($row_position == $back_step || $row_position == $page_entries - $forward_step) { + else if ($row_position == $back_step || $row_position == $page_entries - $forward_step) { $rows[$key]['class'][] = 'taxonomy-term-divider-bottom'; } } @@ -842,7 +842,7 @@ function taxonomy_form_term_submit($form, &$form_state) { } // If we've increased the number of parents and this is a single or flat // hierarchy, update the vocabulary immediately. - elseif ($current_parent_count > $previous_parent_count && $form['#vocabulary']->hierarchy != TAXONOMY_HIERARCHY_MULTIPLE) { + else if ($current_parent_count > $previous_parent_count && $form['#vocabulary']->hierarchy != TAXONOMY_HIERARCHY_MULTIPLE) { $form['#vocabulary']->hierarchy = $current_parent_count == 1 ? TAXONOMY_HIERARCHY_SINGLE : TAXONOMY_HIERARCHY_MULTIPLE; taxonomy_vocabulary_save($form['#vocabulary']); } diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module index 47cde42..82247fe 100644 --- a/core/modules/taxonomy/taxonomy.module +++ b/core/modules/taxonomy/taxonomy.module @@ -477,7 +477,7 @@ function taxonomy_vocabulary_save($vocabulary) { module_invoke_all('taxonomy_vocabulary_update', $vocabulary); module_invoke_all('entity_update', $vocabulary, 'taxonomy_vocabulary'); } - elseif (empty($vocabulary->vid)) { + else if (empty($vocabulary->vid)) { $status = drupal_write_record('taxonomy_vocabulary', $vocabulary); taxonomy_vocabulary_static_reset(); field_attach_create_bundle('taxonomy_term', $vocabulary->machine_name); @@ -620,7 +620,7 @@ function taxonomy_check_vocabulary_hierarchy($vocabulary, $changed_term) { $hierarchy = TAXONOMY_HIERARCHY_MULTIPLE; break; } - elseif (count($term->parents) == 1 && 0 !== array_shift($term->parents)) { + else if (count($term->parents) == 1 && 0 !== array_shift($term->parents)) { $hierarchy = TAXONOMY_HIERARCHY_SINGLE; } } @@ -1465,7 +1465,7 @@ function taxonomy_field_validate($entity_type, $entity, $field, $instance, $lang } // If a parent is specified, then to validate it must appear in the // array returned by taxonomy_term_load_parents_all(). - elseif (!empty($settings['parent'])) { + else if (!empty($settings['parent'])) { $ancestors = taxonomy_term_load_parents_all($item['tid']); foreach ($ancestors as $ancestor) { if ($ancestor->tid == $settings['parent']) { @@ -1884,7 +1884,7 @@ function taxonomy_build_node_index($node) { if (isset($node->{$field_name})) { $items = $node->{$field_name}; } - elseif (isset($node->original->{$field_name})) { + else if (isset($node->original->{$field_name})) { $items = $node->original->{$field_name}; } else { diff --git a/core/modules/taxonomy/taxonomy.tokens.inc b/core/modules/taxonomy/taxonomy.tokens.inc index 24d7bc8..888bc2b 100644 --- a/core/modules/taxonomy/taxonomy.tokens.inc +++ b/core/modules/taxonomy/taxonomy.tokens.inc @@ -147,7 +147,7 @@ function taxonomy_tokens($type, $tokens, array $data = array(), array $options = } } - elseif ($type == 'vocabulary' && !empty($data['vocabulary'])) { + else if ($type == 'vocabulary' && !empty($data['vocabulary'])) { $vocabulary = $data['vocabulary']; foreach ($tokens as $name => $original) { diff --git a/core/modules/translation/translation.module b/core/modules/translation/translation.module index ef34ea6..bd8d7c2 100644 --- a/core/modules/translation/translation.module +++ b/core/modules/translation/translation.module @@ -163,7 +163,7 @@ function translation_form_node_form_alter(&$form, &$form_state) { $form['translation_source'] = array('#type' => 'value', '#value' => $node->translation_source); $form['langcode']['#disabled'] = TRUE; } - elseif (!empty($node->nid) && !empty($node->tnid)) { + else if (!empty($node->nid) && !empty($node->tnid)) { // Disable languages for existing translations, so it is not possible to switch this // node to some language which is already in the translation set. Also remove the // language neutral option. diff --git a/core/modules/translation/translation.test b/core/modules/translation/translation.test index e2b8358..d804b66 100644 --- a/core/modules/translation/translation.test +++ b/core/modules/translation/translation.test @@ -301,7 +301,7 @@ class TranslationTestCase extends DrupalWebTestCase { $this->assertRaw(t('The language %language has been created and can now be used.', array('%language' => $languages[$language_code]->name)), t('Language has been created.')); } } - elseif ($this->xpath('//input[@type="checkbox" and @name=:name and @checked="checked"]', array(':name' => 'languages[' . $language_code . '][enabled]'))) { + else if ($this->xpath('//input[@type="checkbox" and @name=:name and @checked="checked"]', array(':name' => 'languages[' . $language_code . '][enabled]'))) { // It's installed and enabled. No need to do anything. $this->assertTrue(true, 'Language [' . $language_code . '] already installed and enabled.'); } @@ -424,7 +424,7 @@ class TranslationTestCase extends DrupalWebTestCase { if (empty($types)) { $types = array('node', 'block-locale'); } - elseif (is_string($types)) { + else if (is_string($types)) { $types = array($types); } diff --git a/core/modules/update/tests/update_test.module b/core/modules/update/tests/update_test.module index 312a6dd..7020380 100644 --- a/core/modules/update/tests/update_test.module +++ b/core/modules/update/tests/update_test.module @@ -98,7 +98,7 @@ function update_test_mock_page($project_name) { if (isset($xml_map[$project_name])) { $availability_scenario = $xml_map[$project_name]; } - elseif (isset($xml_map['#all'])) { + else if (isset($xml_map['#all'])) { $availability_scenario = $xml_map['#all']; } else { diff --git a/core/modules/update/update.authorize.inc b/core/modules/update/update.authorize.inc index 48dfd35..94d334d 100644 --- a/core/modules/update/update.authorize.inc +++ b/core/modules/update/update.authorize.inc @@ -201,7 +201,7 @@ function update_authorize_update_batch_finished($success, $results) { ); } } - elseif (!$offline) { + else if (!$offline) { $page_message = array( 'message' => t('Update failed! See the log below for more information.'), 'type' => 'error', @@ -259,7 +259,7 @@ function update_authorize_install_batch_finished($success, $results) { ); } } - elseif (!$success && !$offline) { + else if (!$success && !$offline) { $page_message = array( 'message' => t('Installation failed! See the log below for more information.'), 'type' => 'error', diff --git a/core/modules/update/update.compare.inc b/core/modules/update/update.compare.inc index 2ccd97c..ee7693e 100644 --- a/core/modules/update/update.compare.inc +++ b/core/modules/update/update.compare.inc @@ -97,7 +97,7 @@ function _update_process_info_list(&$projects, $list, $project_type, $status) { } } // Otherwise, just add projects of the proper status to our list. - elseif ($file->status != $status) { + else if ($file->status != $status) { continue; } @@ -184,7 +184,7 @@ function _update_process_info_list(&$projects, $list, $project_type, $status) { 'base_themes' => $base_themes, ); } - elseif ($projects[$project_name]['project_type'] == $project_display_type) { + else if ($projects[$project_name]['project_type'] == $project_display_type) { // Only add the file we're processing to the 'includes' array for this // project if it is of the same type and status (which is encoded in the // $project_display_type). This prevents listing all the disabled @@ -200,7 +200,7 @@ function _update_process_info_list(&$projects, $list, $project_type, $status) { $projects[$project_name]['base_themes'] += $base_themes; } } - elseif (empty($status)) { + else if (empty($status)) { // If we have a project_name that matches, but the project_display_type // does not, it means we're processing a disabled module or theme that // belongs to a project that has some enabled code. In this case, we add @@ -221,7 +221,7 @@ function update_get_project_name($file) { if (isset($file->info['project'])) { $project_name = $file->info['project']; } - elseif (isset($file->info['package']) && (strpos($file->info['package'], 'Core') === 0)) { + else if (isset($file->info['package']) && (strpos($file->info['package'], 'Core') === 0)) { $project_name = 'drupal'; } return $project_name; @@ -255,7 +255,7 @@ function update_process_project_info(&$projects) { if (preg_match('/^(\d+\.x-)?(\d+)\..*$/', $info['version'], $matches)) { $info['major'] = $matches[2]; } - elseif (!isset($info['major'])) { + else if (!isset($info['major'])) { // This would only happen for version strings that don't follow the // drupal.org convention. We let contribs define "major" in their // .info in this case, and only if that's missing would we hit this. @@ -455,7 +455,7 @@ function update_calculate_project_update_status($project, &$project_data, $avail if (isset($available['supported_majors'])) { $supported_majors = explode(',', $available['supported_majors']); } - elseif (isset($available['default_major'])) { + else if (isset($available['default_major'])) { // Older release history XML file without supported or recommended. $supported_majors[] = $available['default_major']; } @@ -464,7 +464,7 @@ function update_calculate_project_update_status($project, &$project_data, $avail // Still supported, stay at the current major version. $target_major = $existing_major; } - elseif (isset($available['recommended_major'])) { + else if (isset($available['recommended_major'])) { // Since 'recommended_major' is defined, we know this is the new XML // format. Therefore, we know the current release is unsupported since // its major version was not in the 'supported_majors' list. We should @@ -472,7 +472,7 @@ function update_calculate_project_update_status($project, &$project_data, $avail $target_major = $available['recommended_major']; $project_data['status'] = UPDATE_NOT_SUPPORTED; } - elseif (isset($available['default_major'])) { + else if (isset($available['default_major'])) { // Older release history XML file without recommended, so recommend // the currently defined "default_major" version. $target_major = $available['default_major']; @@ -518,7 +518,7 @@ function update_calculate_project_update_status($project, &$project_data, $avail in_array('Insecure', $release['terms']['Release type'])) { $project_data['status'] = UPDATE_NOT_SECURE; } - elseif ($release['status'] == 'unpublished') { + else if ($release['status'] == 'unpublished') { $project_data['status'] = UPDATE_REVOKED; if (empty($project_data['extra'])) { $project_data['extra'] = array(); @@ -529,7 +529,7 @@ function update_calculate_project_update_status($project, &$project_data, $avail 'data' => t('Your currently installed release has been revoked, and is no longer available for download. Disabling everything included in this release or upgrading is strongly recommended!'), ); } - elseif (isset($release['terms']['Release type']) && + else if (isset($release['terms']['Release type']) && in_array('Unsupported', $release['terms']['Release type'])) { $project_data['status'] = UPDATE_NOT_SUPPORTED; if (empty($project_data['extra'])) { @@ -621,7 +621,7 @@ function update_calculate_project_update_status($project, &$project_data, $avail // We don't have current timestamp info, so we can't know. continue; } - elseif (isset($release['date']) && ($project_data['datestamp'] + 100 > $release['date'])) { + else if (isset($release['date']) && ($project_data['datestamp'] + 100 > $release['date'])) { // We're newer than this, so we can skip it. continue; } @@ -692,7 +692,7 @@ function update_calculate_project_update_status($project, &$project_data, $avail $project_data['status'] = UPDATE_NOT_CHECKED; $project_data['reason'] = t('Unknown release date'); } - elseif (($project_data['datestamp'] + 100 > $latest['date'])) { + else if (($project_data['datestamp'] + 100 > $latest['date'])) { $project_data['status'] = UPDATE_CURRENT; } else { diff --git a/core/modules/update/update.manager.inc b/core/modules/update/update.manager.inc index 82b48f3..4fbed1b 100644 --- a/core/modules/update/update.manager.inc +++ b/core/modules/update/update.manager.inc @@ -103,7 +103,7 @@ function update_manager_update_form($form, $form_state = array(), $context) { $project_name = check_plain($project['title']); } } - elseif (!empty($project['info']['name'])) { + else if (!empty($project['info']['name'])) { $project_name = check_plain($project['info']['name']); } else { @@ -341,7 +341,7 @@ function update_manager_download_batch_finished($success, $results) { ); drupal_set_message(theme('item_list', $error_list), 'error'); } - elseif ($success) { + else if ($success) { drupal_set_message(t('Updates downloaded successfully.')); $_SESSION['update_manager_update_projects'] = $results['projects']; drupal_goto('admin/update/ready'); @@ -621,7 +621,7 @@ function update_manager_install_form_submit($form, &$form_state) { return; } } - elseif ($_FILES['files']['name']['project_upload']) { + else if ($_FILES['files']['name']['project_upload']) { $validators = array('file_validate_extensions' => array(archiver_get_extensions())); $field = 'project_upload'; if (!($finfo = file_save_upload($field, $validators, NULL, FILE_EXISTS_REPLACE))) { diff --git a/core/modules/update/update.module b/core/modules/update/update.module index ea9aec2..2629ab1 100644 --- a/core/modules/update/update.module +++ b/core/modules/update/update.module @@ -138,7 +138,7 @@ function update_init() { if ($status[$type]['severity'] == REQUIREMENT_ERROR) { drupal_set_message($status[$type]['description'], 'error'); } - elseif ($status[$type]['severity'] == REQUIREMENT_WARNING) { + else if ($status[$type]['severity'] == REQUIREMENT_WARNING) { drupal_set_message($status[$type]['description'], 'warning'); } } @@ -697,7 +697,7 @@ function update_verify_update_archive($project, $archive_file, $directory) { if (empty($files)) { $errors[] = t('%archive_file does not contain any .info files.', array('%archive_file' => drupal_basename($archive_file))); } - elseif (!$compatible_project) { + else if (!$compatible_project) { $errors[] = format_plural( count($incompatible), '%archive_file contains a version of %names that is not compatible with Drupal !version.', diff --git a/core/modules/update/update.settings.inc b/core/modules/update/update.settings.inc index 60ac3ca..188893d 100644 --- a/core/modules/update/update.settings.inc +++ b/core/modules/update/update.settings.inc @@ -79,7 +79,7 @@ function update_settings_validate($form, &$form_state) { if (empty($invalid)) { $form_state['notify_emails'] = $valid; } - elseif (count($invalid) == 1) { + else if (count($invalid) == 1) { form_set_error('update_notify_emails', t('%email is not a valid e-mail address.', array('%email' => reset($invalid)))); } else { diff --git a/core/modules/user/user.admin.inc b/core/modules/user/user.admin.inc index f7d4552..5b6eacf 100644 --- a/core/modules/user/user.admin.inc +++ b/core/modules/user/user.admin.inc @@ -975,7 +975,7 @@ function user_admin_role_validate($form, &$form_state) { form_set_error('name', t('The role name %name already exists. Choose another role name.', array('%name' => $form_state['values']['name']))); } } - elseif ($form_state['values']['op'] == t('Add role')) { + else if ($form_state['values']['op'] == t('Add role')) { if (user_role_load_by_name($form_state['values']['name'])) { form_set_error('name', t('The role name %name already exists. Choose another role name.', array('%name' => $form_state['values']['name']))); } @@ -995,7 +995,7 @@ function user_admin_role_submit($form, &$form_state) { user_role_save($role); drupal_set_message(t('The role has been renamed.')); } - elseif ($form_state['values']['op'] == t('Add role')) { + else if ($form_state['values']['op'] == t('Add role')) { user_role_save($role); drupal_set_message(t('The role has been added.')); } diff --git a/core/modules/user/user.module b/core/modules/user/user.module index 865f17b..19042f7 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -456,7 +456,7 @@ function user_save($account, $edit = array()) { file_delete($account->original->picture); } } - elseif (isset($edit['picture_delete']) && $edit['picture_delete']) { + else if (isset($edit['picture_delete']) && $edit['picture_delete']) { file_usage_delete($account->original->picture, 'user', 'user', $account->uid); file_delete($account->original->picture); } @@ -631,7 +631,7 @@ function user_validate_picture(&$form, &$form_state) { if ($file === FALSE) { form_set_error('picture_upload', t("Failed to upload the picture image; the %directory directory doesn't exist or is not writable.", array('%directory' => variable_get('user_picture_path', 'pictures')))); } - elseif ($file !== NULL) { + else if ($file !== NULL) { $form_state['values']['picture_upload'] = $file; } } @@ -994,7 +994,7 @@ function user_account_form(&$form, &$form_state) { $form['#validate'][] = 'user_validate_current_pass'; } } - elseif (!variable_get('user_email_verification', TRUE) || $admin) { + else if (!variable_get('user_email_verification', TRUE) || $admin) { $form['account']['pass'] = array( '#type' => 'password_confirm', '#size' => 25, @@ -1126,7 +1126,7 @@ function user_account_form_validate($form, &$form_state) { if ($error = user_validate_name($form_state['values']['name'])) { form_set_error('name', $error); } - elseif ((bool) db_select('users')->fields('users', array('uid'))->condition('uid', $account->uid, '<>')->condition('name', db_like($form_state['values']['name']), 'LIKE')->range(0, 1)->execute()->fetchField()) { + else if ((bool) db_select('users')->fields('users', array('uid'))->condition('uid', $account->uid, '<>')->condition('name', db_like($form_state['values']['name']), 'LIKE')->range(0, 1)->execute()->fetchField()) { form_set_error('name', t('The name %name is already taken.', array('%name' => $form_state['values']['name']))); } } @@ -1166,7 +1166,7 @@ function user_user_presave(&$edit, $account) { $edit['picture'] = $edit['picture_upload']; } // Delete picture if requested, and if no replacement picture was given. - elseif (!empty($edit['picture_delete'])) { + else if (!empty($edit['picture_delete'])) { $edit['picture'] = NULL; } // Prepare user roles. @@ -1400,7 +1400,7 @@ function template_preprocess_user_picture(&$variables) { $filepath = $account->picture->uri; } } - elseif (variable_get('user_picture_default', '')) { + else if (variable_get('user_picture_default', '')) { $filepath = variable_get('user_picture_default', ''); } if (isset($filepath)) { @@ -1462,7 +1462,7 @@ function template_preprocess_username(&$variables) { $variables['link_attributes']['title'] = t('View user profile.'); $variables['link_path'] = 'user/' . $variables['uid']; } - elseif (!empty($account->homepage)) { + else if (!empty($account->homepage)) { // Like the 'class' attribute, the 'rel' attribute can hold a // space-separated set of values, so initialize it as an array to make it // easier for other preprocess functions to append to it. @@ -1583,7 +1583,7 @@ function user_view_access($account) { if ($GLOBALS['user']->uid == $uid || user_access('administer users')) { return TRUE; } - elseif (user_access('access user profiles')) { + else if (user_access('access user profiles')) { // At this point, load the complete account object. if (!is_object($account)) { $account = user_load($uid); @@ -2151,7 +2151,7 @@ function user_login_final_validate($form, &$form_state) { watchdog('user', 'Login attempt failed for %user.', array('%user' => $form_state['values']['name'])); } } - elseif (isset($form_state['flood_control_user_identifier'])) { + else if (isset($form_state['flood_control_user_identifier'])) { // Clear past failures for this user so as not to block a user who might // log in and out more than once in an hour. flood_clear_event('failed_login_attempt_user', $form_state['flood_control_user_identifier']); @@ -3373,7 +3373,7 @@ function user_build_filter_query(SelectInterface $query) { $permission_alias = $query->join('role_permission', 'p', $users_roles_alias . '.rid = %alias.rid'); $query->condition($permission_alias . '.permission', $value); } - elseif ($key == 'role') { + else if ($key == 'role') { $users_roles_alias = $query->join('users_roles', 'ur', '%alias.uid = u.uid'); $query->condition($users_roles_alias . '.rid' , $value); } @@ -3601,7 +3601,7 @@ function user_block_user_action(&$entity, $context = array()) { if (isset($entity->uid)) { $uid = $entity->uid; } - elseif (isset($context['uid'])) { + else if (isset($context['uid'])) { $uid = $context['uid']; } // If neither of those are valid, then block the current user. @@ -3785,7 +3785,7 @@ function user_register_submit($form, &$form_state) { drupal_set_message(t('Created a new user account for %name. No e-mail has been sent.', array('@url' => url($uri['path'], $uri['options']), '%name' => $account->name))); } // No e-mail verification required; log in user immediately. - elseif (!$admin && !variable_get('user_email_verification', TRUE) && $account->status) { + else if (!$admin && !variable_get('user_email_verification', TRUE) && $account->status) { _user_mail_notify('register_no_approval_required', $account); $form_state['uid'] = $account->uid; user_login_submit(array(), $form_state); @@ -3793,7 +3793,7 @@ function user_register_submit($form, &$form_state) { $form_state['redirect'] = ''; } // No administrator approval required. - elseif ($account->status || $notify) { + else if ($account->status || $notify) { $op = $notify ? 'register_admin_created' : 'register_no_approval_required'; _user_mail_notify($op, $account); if ($notify) { diff --git a/core/modules/user/user.pages.inc b/core/modules/user/user.pages.inc index c54bd4c..31a0926 100644 --- a/core/modules/user/user.pages.inc +++ b/core/modules/user/user.pages.inc @@ -124,7 +124,7 @@ function user_pass_reset($form, &$form_state, $uid, $timestamp, $hashed_pass, $a drupal_set_message(t('You have tried to use a one-time login link that has expired. Please request a new one using the form below.')); drupal_goto('user/password'); } - elseif ($account->uid && $timestamp >= $account->login && $timestamp <= $current && $hashed_pass == user_pass_rehash($account->pass, $timestamp, $account->login)) { + else if ($account->uid && $timestamp >= $account->login && $timestamp <= $current && $hashed_pass == user_pass_rehash($account->pass, $timestamp, $account->login)) { // First stage is a confirmation form, then login if ($action == 'login') { watchdog('user', 'User %name used one-time login link at time %timestamp.', array('%name' => $account->name, '%timestamp' => $timestamp)); diff --git a/core/scripts/drupal.sh b/core/scripts/drupal.sh index cf17e68..4f93e14 100755 --- a/core/scripts/drupal.sh +++ b/core/scripts/drupal.sh @@ -118,7 +118,7 @@ while ($param = array_shift($_SERVER['argv'])) { $_SERVER['PHP_SELF'] = $_SERVER['REQUEST_URI'] = $path['path']; $cmd = substr($path['path'], 1); } - elseif (isset($path['path'])) { + else if (isset($path['path'])) { if (!isset($_GET['q'])) { $_REQUEST['q'] = $_GET['q'] = $path['path']; } diff --git a/core/scripts/run-tests.sh b/core/scripts/run-tests.sh index 5bf95fb..e904016 100755 --- a/core/scripts/run-tests.sh +++ b/core/scripts/run-tests.sh @@ -254,11 +254,11 @@ function simpletest_script_init($server_software) { if (!empty($args['php'])) { $php = $args['php']; } - elseif (!empty($_ENV['_'])) { + else if (!empty($_ENV['_'])) { // '_' is an environment variable set by the shell. It contains the command that was executed. $php = $_ENV['_']; } - elseif (!empty($_ENV['SUDO_COMMAND'])) { + else if (!empty($_ENV['SUDO_COMMAND'])) { // 'SUDO_COMMAND' is an environment variable set by the sudo program. // Extract only the PHP interpreter, not the rest of the command. list($php, ) = explode(' ', $_ENV['SUDO_COMMAND'], 2); @@ -424,7 +424,7 @@ function simpletest_script_get_test_list() { } } } - elseif ($args['file']) { + else if ($args['file']) { $files = array(); foreach ($args['test_names'] as $file) { $files[drupal_realpath($file)] = 1; @@ -544,7 +544,7 @@ function simpletest_script_reporter_write_xml_results() { $fail->appendChild($text); $case->appendChild($fail); } - elseif ($result->status == 'exception') { + else if ($result->status == 'exception') { // In the case of an exception the $result->function may not be a class // method so we record the full function name: $case->setAttribute('name', $result->function); diff --git a/core/vendor/Symfony/Component/ClassLoader/ClassCollectionLoader.php b/core/vendor/Symfony/Component/ClassLoader/ClassCollectionLoader.php index da777f2..30e7639 100644 --- a/core/vendor/Symfony/Component/ClassLoader/ClassCollectionLoader.php +++ b/core/vendor/Symfony/Component/ClassLoader/ClassCollectionLoader.php @@ -137,10 +137,10 @@ class ClassCollectionLoader $token = $tokens[$i]; if (is_string($token)) { $output .= $token; - } elseif (in_array($token[0], array(T_COMMENT, T_DOC_COMMENT))) { + } else if (in_array($token[0], array(T_COMMENT, T_DOC_COMMENT))) { // strip comments continue; - } elseif (T_NAMESPACE === $token[0]) { + } else if (T_NAMESPACE === $token[0]) { if ($inNamespace) { $output .= "}\n"; } @@ -209,7 +209,7 @@ class ClassCollectionLoader foreach (token_get_all($source) as $token) { if (is_string($token)) { $output .= $token; - } elseif (!in_array($token[0], array(T_COMMENT, T_DOC_COMMENT))) { + } else if (!in_array($token[0], array(T_COMMENT, T_DOC_COMMENT))) { $output .= $token[1]; } } diff --git a/core/vendor/Symfony/Component/EventDispatcher/EventDispatcher.php b/core/vendor/Symfony/Component/EventDispatcher/EventDispatcher.php index 0c98301..40bdba2 100644 --- a/core/vendor/Symfony/Component/EventDispatcher/EventDispatcher.php +++ b/core/vendor/Symfony/Component/EventDispatcher/EventDispatcher.php @@ -120,7 +120,7 @@ class EventDispatcher implements EventDispatcherInterface foreach ($subscriber->getSubscribedEvents() as $eventName => $params) { if (is_string($params)) { $this->addListener($eventName, array($subscriber, $params)); - } elseif (is_string($params[0])) { + } else if (is_string($params[0])) { $this->addListener($eventName, array($subscriber, $params[0]), $params[1]); } else { foreach ($params as $listener) { diff --git a/core/vendor/Symfony/Component/HttpFoundation/Cookie.php b/core/vendor/Symfony/Component/HttpFoundation/Cookie.php index 0511162..53dba06 100644 --- a/core/vendor/Symfony/Component/HttpFoundation/Cookie.php +++ b/core/vendor/Symfony/Component/HttpFoundation/Cookie.php @@ -55,7 +55,7 @@ class Cookie // convert expiration time to a Unix timestamp if ($expire instanceof \DateTime) { $expire = $expire->format('U'); - } elseif (!is_numeric($expire)) { + } else if (!is_numeric($expire)) { $expire = strtotime($expire); if (false === $expire || -1 === $expire) { diff --git a/core/vendor/Symfony/Component/HttpFoundation/File/File.php b/core/vendor/Symfony/Component/HttpFoundation/File/File.php index 58bc6f4..d47a833 100644 --- a/core/vendor/Symfony/Component/HttpFoundation/File/File.php +++ b/core/vendor/Symfony/Component/HttpFoundation/File/File.php @@ -528,7 +528,7 @@ class File extends \SplFileInfo if (false === @mkdir($directory, 0777, true)) { throw new FileException(sprintf('Unable to create the "%s" directory', $directory)); } - } elseif (!is_writable($directory)) { + } else if (!is_writable($directory)) { throw new FileException(sprintf('Unable to write in the "%s" directory', $directory)); } diff --git a/core/vendor/Symfony/Component/HttpFoundation/ParameterBag.php b/core/vendor/Symfony/Component/HttpFoundation/ParameterBag.php index e5d237c..d15c4fe 100644 --- a/core/vendor/Symfony/Component/HttpFoundation/ParameterBag.php +++ b/core/vendor/Symfony/Component/HttpFoundation/ParameterBag.php @@ -113,7 +113,7 @@ class ParameterBag } $currentKey = ''; - } elseif (']' === $char) { + } else if (']' === $char) { if (null === $currentKey) { throw new \InvalidArgumentException(sprintf('Malformed path. Unexpected "]" at position %d.', $i)); } diff --git a/core/vendor/Symfony/Component/HttpFoundation/Request.php b/core/vendor/Symfony/Component/HttpFoundation/Request.php index 3a20ed9..5fc94ca 100644 --- a/core/vendor/Symfony/Component/HttpFoundation/Request.php +++ b/core/vendor/Symfony/Component/HttpFoundation/Request.php @@ -452,7 +452,7 @@ class Request if ($proxy) { if ($this->server->has('HTTP_CLIENT_IP')) { return $this->server->get('HTTP_CLIENT_IP'); - } elseif (self::$trustProxy && $this->server->has('HTTP_X_FORWARDED_FOR')) { + } else if (self::$trustProxy && $this->server->has('HTTP_X_FORWARDED_FOR')) { $clientIp = explode(',', $this->server->get('HTTP_X_FORWARDED_FOR'), 2); return isset($clientIp[0]) ? trim($clientIp[0]) : ''; @@ -1086,17 +1086,17 @@ class Request if ($this->headers->has('X_REWRITE_URL') && false !== stripos(PHP_OS, 'WIN')) { // check this first so IIS will catch $requestUri = $this->headers->get('X_REWRITE_URL'); - } elseif ($this->server->get('IIS_WasUrlRewritten') == '1' && $this->server->get('UNENCODED_URL') != '') { + } else if ($this->server->get('IIS_WasUrlRewritten') == '1' && $this->server->get('UNENCODED_URL') != '') { // IIS7 with URL Rewrite: make sure we get the unencoded url (double slash problem) $requestUri = $this->server->get('UNENCODED_URL'); - } elseif ($this->server->has('REQUEST_URI')) { + } else if ($this->server->has('REQUEST_URI')) { $requestUri = $this->server->get('REQUEST_URI'); // HTTP proxy reqs setup request uri with scheme and host [and port] + the url path, only use url path $schemeAndHttpHost = $this->getScheme().'://'.$this->getHttpHost(); if (strpos($requestUri, $schemeAndHttpHost) === 0) { $requestUri = substr($requestUri, strlen($schemeAndHttpHost)); } - } elseif ($this->server->has('ORIG_PATH_INFO')) { + } else if ($this->server->has('ORIG_PATH_INFO')) { // IIS 5.0, PHP as CGI $requestUri = $this->server->get('ORIG_PATH_INFO'); if ($this->server->get('QUERY_STRING')) { @@ -1113,9 +1113,9 @@ class Request if (basename($this->server->get('SCRIPT_NAME')) === $filename) { $baseUrl = $this->server->get('SCRIPT_NAME'); - } elseif (basename($this->server->get('PHP_SELF')) === $filename) { + } else if (basename($this->server->get('PHP_SELF')) === $filename) { $baseUrl = $this->server->get('PHP_SELF'); - } elseif (basename($this->server->get('ORIG_SCRIPT_NAME')) === $filename) { + } else if (basename($this->server->get('ORIG_SCRIPT_NAME')) === $filename) { $baseUrl = $this->server->get('ORIG_SCRIPT_NAME'); // 1and1 shared hosting compatibility } else { // Backtrack up the script_filename to find the portion matching @@ -1217,7 +1217,7 @@ class Request if ((null !== $baseUrl) && (false === ($pathInfo = substr(urldecode($requestUri), strlen(urldecode($baseUrl)))))) { // If substr() returns false then PATH_INFO is set to an empty string return '/'; - } elseif (null === $baseUrl) { + } else if (null === $baseUrl) { return $requestUri; } diff --git a/core/vendor/Symfony/Component/HttpFoundation/Response.php b/core/vendor/Symfony/Component/HttpFoundation/Response.php index b6cb484..be35f1a 100644 --- a/core/vendor/Symfony/Component/HttpFoundation/Response.php +++ b/core/vendor/Symfony/Component/HttpFoundation/Response.php @@ -134,7 +134,7 @@ class Response $charset = $this->charset ?: 'UTF-8'; if (!$this->headers->has('Content-Type')) { $this->headers->set('Content-Type', 'text/html; charset='.$charset); - } elseif (0 === strpos($this->headers->get('Content-Type'), 'text/') && false === strpos($this->headers->get('Content-Type'), 'charset')) { + } else if (0 === strpos($this->headers->get('Content-Type'), 'text/') && false === strpos($this->headers->get('Content-Type'), 'charset')) { // add the charset $this->headers->set('Content-Type', $this->headers->get('Content-Type').'; charset='.$charset); } @@ -789,7 +789,7 @@ class Response $notModified = false; if ($etags = $request->getEtags()) { $notModified = (in_array($this->getEtag(), $etags) || in_array('*', $etags)) && (!$lastModified || $this->headers->get('Last-Modified') == $lastModified); - } elseif ($lastModified) { + } else if ($lastModified) { $notModified = $lastModified == $this->headers->get('Last-Modified'); } diff --git a/core/vendor/Symfony/Component/HttpFoundation/ServerBag.php b/core/vendor/Symfony/Component/HttpFoundation/ServerBag.php index 9cb7786..46ffbdd 100644 --- a/core/vendor/Symfony/Component/HttpFoundation/ServerBag.php +++ b/core/vendor/Symfony/Component/HttpFoundation/ServerBag.php @@ -27,7 +27,7 @@ class ServerBag extends ParameterBag $headers[substr($key, 5)] = $value; } // CONTENT_* are not prefixed with HTTP_ - elseif (in_array($key, array('CONTENT_LENGTH', 'CONTENT_MD5', 'CONTENT_TYPE'))) { + else if (in_array($key, array('CONTENT_LENGTH', 'CONTENT_MD5', 'CONTENT_TYPE'))) { $headers[$key] = $this->parameters[$key]; } } diff --git a/core/vendor/Symfony/Component/HttpKernel/Client.php b/core/vendor/Symfony/Component/HttpKernel/Client.php index ff93bf7..0daaec2 100644 --- a/core/vendor/Symfony/Component/HttpKernel/Client.php +++ b/core/vendor/Symfony/Component/HttpKernel/Client.php @@ -133,7 +133,7 @@ EOF; foreach ($files as $key => $value) { if (is_array($value)) { $filtered[$key] = $this->filterFiles($value); - } elseif ($value instanceof UploadedFile) { + } else if ($value instanceof UploadedFile) { if ($value->isValid() && $value->getSize() > UploadedFile::getMaxFilesize()) { $filtered[$key] = new UploadedFile( '', diff --git a/core/vendor/Symfony/Component/HttpKernel/Controller/ControllerResolver.php b/core/vendor/Symfony/Component/HttpKernel/Controller/ControllerResolver.php index d535c55..99dc692 100644 --- a/core/vendor/Symfony/Component/HttpKernel/Controller/ControllerResolver.php +++ b/core/vendor/Symfony/Component/HttpKernel/Controller/ControllerResolver.php @@ -71,7 +71,7 @@ class ControllerResolver implements ControllerResolverInterface if (false === strpos($controller, ':')) { if (method_exists($controller, '__invoke')) { return new $controller; - } elseif (function_exists($controller)) { + } else if (function_exists($controller)) { return $controller; } } @@ -99,7 +99,7 @@ class ControllerResolver implements ControllerResolverInterface { if (is_array($controller)) { $r = new \ReflectionMethod($controller[0], $controller[1]); - } elseif (is_object($controller) && !$controller instanceof \Closure) { + } else if (is_object($controller) && !$controller instanceof \Closure) { $r = new \ReflectionObject($controller); $r = $r->getMethod('__invoke'); } else { @@ -116,14 +116,14 @@ class ControllerResolver implements ControllerResolverInterface foreach ($parameters as $param) { if (array_key_exists($param->getName(), $attributes)) { $arguments[] = $attributes[$param->getName()]; - } elseif ($param->getClass() && $param->getClass()->isInstance($request)) { + } else if ($param->getClass() && $param->getClass()->isInstance($request)) { $arguments[] = $request; - } elseif ($param->isDefaultValueAvailable()) { + } else if ($param->isDefaultValueAvailable()) { $arguments[] = $param->getDefaultValue(); } else { if (is_array($controller)) { $repr = sprintf('%s::%s()', get_class($controller[0]), $controller[1]); - } elseif (is_object($controller)) { + } else if (is_object($controller)) { $repr = get_class($controller); } else { $repr = $controller; diff --git a/core/vendor/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/core/vendor/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php index 54d9fac..9804424 100644 --- a/core/vendor/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php +++ b/core/vendor/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php @@ -156,7 +156,7 @@ class RequestDataCollector extends DataCollector if (0 !== $expires) { if (is_numeric($expires)) { $expires = (int) $expires; - } elseif ($expires instanceof \DateTime) { + } else if ($expires instanceof \DateTime) { $expires = $expires->getTimestamp(); } else { $expires = strtotime($expires); diff --git a/core/vendor/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php b/core/vendor/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php index a9da249..e8a446a 100644 --- a/core/vendor/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php +++ b/core/vendor/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php @@ -241,15 +241,15 @@ EOF; foreach ($args as $key => $item) { if ('object' === $item[0]) { $formattedValue = sprintf("object(%s)", $this->abbrClass($item[1])); - } elseif ('array' === $item[0]) { + } else if ('array' === $item[0]) { $formattedValue = sprintf("array(%s)", is_array($item[1]) ? $this->formatArgs($item[1]) : $item[1]); - } elseif ('string' === $item[0]) { + } else if ('string' === $item[0]) { $formattedValue = sprintf("'%s'", htmlspecialchars($item[1], ENT_QUOTES | ENT_SUBSTITUTE, $this->charset)); - } elseif ('null' === $item[0]) { + } else if ('null' === $item[0]) { $formattedValue = 'null'; - } elseif ('boolean' === $item[0]) { + } else if ('boolean' === $item[0]) { $formattedValue = ''.strtolower(var_export($item[1], true)).''; - } elseif ('resource' === $item[0]) { + } else if ('resource' === $item[0]) { $formattedValue = 'resource'; } else { $formattedValue = str_replace("\n", '', var_export(htmlspecialchars((string) $item[1], ENT_QUOTES | ENT_SUBSTITUTE, $this->charset), true)); diff --git a/core/vendor/Symfony/Component/HttpKernel/Exception/FlattenException.php b/core/vendor/Symfony/Component/HttpKernel/Exception/FlattenException.php index c48606e..044b0cc 100644 --- a/core/vendor/Symfony/Component/HttpKernel/Exception/FlattenException.php +++ b/core/vendor/Symfony/Component/HttpKernel/Exception/FlattenException.php @@ -180,17 +180,17 @@ class FlattenException foreach ($args as $key => $value) { if (is_object($value)) { $result[$key] = array('object', get_class($value)); - } elseif (is_array($value)) { + } else if (is_array($value)) { if ($level > 10) { $result[$key] = array('array', '*DEEP NESTED ARRAY*'); } else { $result[$key] = array('array', $this->flattenArgs($value, ++$level)); } - } elseif (null === $value) { + } else if (null === $value) { $result[$key] = array('null', null); - } elseif (is_bool($value)) { + } else if (is_bool($value)) { $result[$key] = array('boolean', $value); - } elseif (is_resource($value)) { + } else if (is_resource($value)) { $result[$key] = array('resource', get_resource_type($value)); } else { $result[$key] = array('string', (string) $value); diff --git a/core/vendor/Symfony/Component/HttpKernel/HttpCache/Esi.php b/core/vendor/Symfony/Component/HttpKernel/HttpCache/Esi.php index e1a0e6a..4ab4d91 100644 --- a/core/vendor/Symfony/Component/HttpKernel/HttpCache/Esi.php +++ b/core/vendor/Symfony/Component/HttpKernel/HttpCache/Esi.php @@ -167,9 +167,9 @@ class Esi $value = $response->headers->get('Surrogate-Control'); if ('content="ESI/1.0"' == $value) { $response->headers->remove('Surrogate-Control'); - } elseif (preg_match('#,\s*content="ESI/1.0"#', $value)) { + } else if (preg_match('#,\s*content="ESI/1.0"#', $value)) { $response->headers->set('Surrogate-Control', preg_replace('#,\s*content="ESI/1.0"#', '', $value)); - } elseif (preg_match('#content="ESI/1.0",\s*#', $value)) { + } else if (preg_match('#content="ESI/1.0",\s*#', $value)) { $response->headers->set('Surrogate-Control', preg_replace('#content="ESI/1.0",\s*#', '', $value)); } } diff --git a/core/vendor/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/core/vendor/Symfony/Component/HttpKernel/HttpCache/HttpCache.php index e0a3d12..364b07b 100644 --- a/core/vendor/Symfony/Component/HttpKernel/HttpCache/HttpCache.php +++ b/core/vendor/Symfony/Component/HttpKernel/HttpCache/HttpCache.php @@ -187,7 +187,7 @@ class HttpCache implements HttpKernelInterface, TerminableInterface if (!$request->isMethodSafe()) { $response = $this->invalidate($request, $catch); - } elseif ($request->headers->has('expect')) { + } else if ($request->headers->has('expect')) { $response = $this->pass($request, $catch); } else { $response = $this->lookup($request, $catch); @@ -417,7 +417,7 @@ class HttpCache implements HttpKernelInterface, TerminableInterface if ($this->isPrivateRequest($request) && !$response->headers->hasCacheControlDirective('public')) { $response->setPrivate(true); - } elseif ($this->options['default_ttl'] > 0 && null === $response->getTtl() && !$response->headers->getCacheControlDirective('must-revalidate')) { + } else if ($this->options['default_ttl'] > 0 && null === $response->getTtl() && !$response->headers->getCacheControlDirective('must-revalidate')) { $response->setTtl($this->options['default_ttl']); } @@ -601,7 +601,7 @@ class HttpCache implements HttpKernelInterface, TerminableInterface if (!$response->headers->has('Transfer-Encoding')) { $response->headers->set('Content-Length', strlen($response->getContent())); } - } elseif ($response->headers->has('X-Body-File')) { + } else if ($response->headers->has('X-Body-File')) { $response->setContent(file_get_contents($response->headers->get('X-Body-File'))); } else { return; @@ -634,7 +634,7 @@ class HttpCache implements HttpKernelInterface, TerminableInterface if (count($request->cookies->all())) { return true; } - } elseif ($request->headers->has($key)) { + } else if ($request->headers->has($key)) { return true; } } diff --git a/core/vendor/Symfony/Component/HttpKernel/Kernel.php b/core/vendor/Symfony/Component/HttpKernel/Kernel.php index 05f895f..41239ae 100644 --- a/core/vendor/Symfony/Component/HttpKernel/Kernel.php +++ b/core/vendor/Symfony/Component/HttpKernel/Kernel.php @@ -634,7 +634,7 @@ abstract class Kernel implements KernelInterface, TerminableInterface if (false === @mkdir($dir, 0777, true)) { throw new \RuntimeException(sprintf("Unable to create the %s directory (%s)\n", $name, $dir)); } - } elseif (!is_writable($dir)) { + } else if (!is_writable($dir)) { throw new \RuntimeException(sprintf("Unable to write in the %s directory (%s)\n", $name, $dir)); } } @@ -731,7 +731,7 @@ abstract class Kernel implements KernelInterface, TerminableInterface foreach (token_get_all($source) as $token) { if (is_string($token)) { $output .= $token; - } elseif (!in_array($token[0], array(T_COMMENT, T_DOC_COMMENT))) { + } else if (!in_array($token[0], array(T_COMMENT, T_DOC_COMMENT))) { $output .= $token[1]; } } diff --git a/core/vendor/Symfony/Component/HttpKernel/Profiler/SqliteProfilerStorage.php b/core/vendor/Symfony/Component/HttpKernel/Profiler/SqliteProfilerStorage.php index 638d0cb..d30517d 100644 --- a/core/vendor/Symfony/Component/HttpKernel/Profiler/SqliteProfilerStorage.php +++ b/core/vendor/Symfony/Component/HttpKernel/Profiler/SqliteProfilerStorage.php @@ -34,7 +34,7 @@ class SqliteProfilerStorage extends PdoProfilerStorage // busyTimeout only exists for PHP >= 5.3.3 $db->busyTimeout(1000); } - } elseif (class_exists('PDO') && in_array('sqlite', \PDO::getAvailableDrivers(), true)) { + } else if (class_exists('PDO') && in_array('sqlite', \PDO::getAvailableDrivers(), true)) { $db = new \PDO($this->dsn); } else { throw new \RuntimeException('You need to enable either the SQLite3 or PDO_SQLite extension for the profiler to run properly.'); diff --git a/core/vendor/Symfony/Component/Routing/Generator/UrlGenerator.php b/core/vendor/Symfony/Component/Routing/Generator/UrlGenerator.php index 535f7bb..aef92f3 100644 --- a/core/vendor/Symfony/Component/Routing/Generator/UrlGenerator.php +++ b/core/vendor/Symfony/Component/Routing/Generator/UrlGenerator.php @@ -126,7 +126,7 @@ class UrlGenerator implements UrlGeneratorInterface $optional = false; } - } elseif ('text' === $token[0]) { + } else if ('text' === $token[0]) { $url = $token[1].$url; $optional = false; } @@ -155,7 +155,7 @@ class UrlGenerator implements UrlGeneratorInterface $port = ''; if ('http' === $scheme && 80 != $this->context->getHttpPort()) { $port = ':'.$this->context->getHttpPort(); - } elseif ('https' === $scheme && 443 != $this->context->getHttpsPort()) { + } else if ('https' === $scheme && 443 != $this->context->getHttpsPort()) { $port = ':'.$this->context->getHttpsPort(); } diff --git a/core/vendor/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php b/core/vendor/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php index 66ba493..c96a095 100644 --- a/core/vendor/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php +++ b/core/vendor/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php @@ -52,7 +52,7 @@ class ApacheUrlMatcher extends UrlMatcher if ('_route' == $name) { $match = true; - } elseif (0 === strpos($name, '_allow_')) { + } else if (0 === strpos($name, '_allow_')) { $allow[] = substr($name, 7); } else { $parameters[$name] = $value; @@ -63,7 +63,7 @@ class ApacheUrlMatcher extends UrlMatcher if ($match) { return $parameters; - } elseif (0 < count($allow)) { + } else if (0 < count($allow)) { throw new MethodNotAllowedException($allow); } else { return parent::match($pathinfo); diff --git a/core/vendor/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/core/vendor/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php index 5c2fcb4..ec2dda1 100644 --- a/core/vendor/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php +++ b/core/vendor/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php @@ -234,10 +234,10 @@ EOF if (true === $matches && $compiledRoute->getDefaults()) { $code[] = sprintf(" return array_merge(\$this->mergeDefaults(\$matches, %s), array('_route' => '%s'));" , str_replace("\n", '', var_export($compiledRoute->getDefaults(), true)), $name); - } elseif (true === $matches) { + } else if (true === $matches) { $code[] = sprintf(" \$matches['_route'] = '%s';", $name); $code[] = sprintf(" return \$matches;", $name); - } elseif ($compiledRoute->getDefaults()) { + } else if ($compiledRoute->getDefaults()) { $code[] = sprintf(' return %s;', str_replace("\n", '', var_export(array_merge($compiledRoute->getDefaults(), array('_route' => $name)), true))); } else { $code[] = sprintf(" return array('_route' => '%s');", $name);