Index: update.php =================================================================== RCS file: /cvs/drupal/drupal/update.php,v retrieving revision 1.252 diff -u -r1.252 update.php --- update.php 3 Feb 2008 18:41:16 -0000 1.252 +++ update.php 14 Jul 2008 12:37:11 -0000 @@ -455,7 +455,7 @@ if ($type == 'module' && isset($modules[$name])) { $file = $modules[$name]; } - else if ($type == 'theme' && isset($themes[$name])) { + elseif ($type == 'theme' && isset($themes[$name])) { $file = $themes[$name]; } if (!isset($file) Index: includes/cache.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/cache.inc,v retrieving revision 1.17 diff -u -r1.17 cache.inc --- includes/cache.inc 29 Jan 2008 11:36:06 -0000 1.17 +++ includes/cache.inc 14 Jul 2008 12:37:13 -0000 @@ -154,7 +154,7 @@ // This is the first request to clear the cache, start a timer. variable_set('cache_flush', time()); } - else if (time() > ($cache_flush + variable_get('cache_lifetime', 0))) { + elseif (time() > ($cache_flush + variable_get('cache_lifetime', 0))) { // Clear the cache for everyone, cache_flush_delay seconds have // passed since the first request to clear the cache. db_query("DELETE FROM {". $table ."} WHERE expire != %d AND expire < %d", CACHE_PERMANENT, time()); Index: includes/common.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/common.inc,v retrieving revision 1.756.2.21 diff -u -r1.756.2.21 common.inc --- includes/common.inc 9 Jul 2008 21:58:35 -0000 1.756.2.21 +++ includes/common.inc 14 Jul 2008 12:37:15 -0000 @@ -298,7 +298,7 @@ if (isset($_REQUEST['destination'])) { extract(parse_url(urldecode($_REQUEST['destination']))); } - else if (isset($_REQUEST['edit']['destination'])) { + elseif (isset($_REQUEST['edit']['destination'])) { extract(parse_url(urldecode($_REQUEST['edit']['destination']))); } @@ -1183,25 +1183,25 @@ if (strpos('AaDlM', $c) !== FALSE) { $date .= t(gmdate($c, $timestamp), array(), $langcode); } - else if ($c == 'F') { + elseif ($c == 'F') { // Special treatment for long month names: May is both an abbreviation // and a full month name in English, but other languages have // different abbreviations. $date .= trim(t('!long-month-name '. gmdate($c, $timestamp), array('!long-month-name' => ''), $langcode)); } - else if (strpos('BdgGhHiIjLmnsStTUwWYyz', $c) !== FALSE) { + elseif (strpos('BdgGhHiIjLmnsStTUwWYyz', $c) !== FALSE) { $date .= gmdate($c, $timestamp); } - else if ($c == 'r') { + elseif ($c == 'r') { $date .= format_date($timestamp - $timezone, 'custom', 'D, d M Y H:i:s O', $timezone, $langcode); } - else if ($c == 'O') { + elseif ($c == 'O') { $date .= sprintf('%s%02d%02d', ($timezone < 0 ? '-' : '+'), abs($timezone / 3600), abs($timezone % 3600) / 60); } - else if ($c == 'Z') { + elseif ($c == 'Z') { $date .= $timezone; } - else if ($c == '\\') { + elseif ($c == '\\') { $date .= $format[++$i]; } else { @@ -1726,7 +1726,7 @@ } // If a CSS file is not to be preprocessed and it's a theme CSS file, it needs to *always* appear at the *bottom*, // regardless of whether preprocessing is on or off. - else if (!$preprocess && $type == 'theme') { + elseif (!$preprocess && $type == 'theme') { $no_theme_preprocess .= ''."\n"; } else { @@ -2480,7 +2480,7 @@ if (zlib_get_coding_type() == 'deflate') { $cache = FALSE; } - else if (zlib_get_coding_type() == FALSE) { + elseif (zlib_get_coding_type() == FALSE) { $data = gzencode($data, 9, FORCE_GZIP); } // The remaining case is 'gzip' which means the data is Index: includes/file.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/file.inc,v retrieving revision 1.121.2.2 diff -u -r1.121.2.2 file.inc --- includes/file.inc 23 Apr 2008 18:18:09 -0000 1.121.2.2 +++ includes/file.inc 14 Jul 2008 12:37:18 -0000 @@ -71,11 +71,11 @@ return $dest; } // check if the destination is instead inside the Drupal temporary files directory. - else if (file_check_location($dest, file_directory_temp())) { + elseif (file_check_location($dest, file_directory_temp())) { return $dest; } // Not found, try again with prefixed directory path. - else if (file_check_location($file_path .'/'. $dest, $file_path)) { + elseif (file_check_location($file_path .'/'. $dest, $file_path)) { return $file_path .'/'. $dest; } // File not found. Index: includes/form.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/form.inc,v retrieving revision 1.265.2.7 diff -u -r1.265.2.7 form.inc --- includes/form.inc 25 Jun 2008 09:58:09 -0000 1.265.2.7 +++ includes/form.inc 14 Jul 2008 12:37:20 -0000 @@ -481,7 +481,7 @@ $form['form_token'] = array('#type' => 'token', '#default_value' => drupal_get_token($form['#token'])); } } - else if (isset($user->uid) && $user->uid && !$form['#programmed']) { + elseif (isset($user->uid) && $user->uid && !$form['#programmed']) { $form['#token'] = $form_id; $form['form_token'] = array( '#id' => form_clean_id('edit-'. $form_id .'-form-token'), @@ -1359,7 +1359,7 @@ if (is_object($value)) { form_options_flatten($value->option, FALSE); } - else if (is_array($value)) { + elseif (is_array($value)) { form_options_flatten($value, FALSE); } else { @@ -1463,12 +1463,12 @@ if (is_array($choice)) { return FALSE; } - else if (is_object($choice)) { + elseif (is_object($choice)) { if (isset($choice->option[$key])) { $keys[] = $index; } } - else if ($index == $key) { + elseif ($index == $key) { $keys[] = $index; } } Index: includes/locale.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/locale.inc,v retrieving revision 1.174.2.1 diff -u -r1.174.2.1 locale.inc --- includes/locale.inc 9 Jul 2008 21:48:28 -0000 1.174.2.1 +++ includes/locale.inc 14 Jul 2008 12:37:24 -0000 @@ -1310,7 +1310,7 @@ db_query("INSERT INTO {locales_target} (lid, language, translation, plid, plural) VALUES (%d, '%s', '%s', %d, %d)", $lid, $langcode, $translation, $plid, $plural); $report[0]++; } - else if ($mode == LOCALE_IMPORT_OVERWRITE) { + elseif ($mode == LOCALE_IMPORT_OVERWRITE) { // Translation exists, only overwrite if instructed. db_query("UPDATE {locales_target} SET translation = '%s', plid = %d, plural = %d WHERE language = '%s' AND lid = %d", $translation, $plid, $plural, $langcode, $lid); $report[1]++; Index: includes/module.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/module.inc,v retrieving revision 1.115 diff -u -r1.115 module.inc --- includes/module.inc 27 Dec 2007 12:31:05 -0000 1.115 +++ includes/module.inc 14 Jul 2008 12:37:26 -0000 @@ -472,7 +472,7 @@ if (isset($result) && is_array($result)) { $return = array_merge_recursive($return, $result); } - else if (isset($result)) { + elseif (isset($result)) { $return[] = $result; } } Index: includes/pager.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/pager.inc,v retrieving revision 1.63 diff -u -r1.63 pager.inc --- includes/pager.inc 6 Dec 2007 09:58:30 -0000 1.63 +++ includes/pager.inc 14 Jul 2008 12:37:27 -0000 @@ -401,7 +401,7 @@ if (isset($titles[$text])) { $attributes['title'] = $titles[$text]; } - else if (is_numeric($text)) { + elseif (is_numeric($text)) { $attributes['title'] = t('Go to page @number', array('@number' => $text)); } } Index: includes/theme.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.inc,v retrieving revision 1.415.2.9 diff -u -r1.415.2.9 theme.inc --- includes/theme.inc 9 Jul 2008 21:48:28 -0000 1.415.2.9 +++ includes/theme.inc 14 Jul 2008 12:37:29 -0000 @@ -1120,7 +1120,7 @@ // Pass in $link as $options, they share the same keys. $output .= l($link['title'], $link['href'], $link); } - else if (!empty($link['title'])) { + elseif (!empty($link['title'])) { // Some links are actually not links, but we wrap these in for adding title and class attributes if (empty($link['html'])) { $link['title'] = check_plain($link['title']); @@ -1384,7 +1384,7 @@ if ($type == MARK_NEW) { return ' '. t('new') .''; } - else if ($type == MARK_UPDATED) { + elseif ($type == MARK_UPDATED) { return ' '. t('updated') .''; } } @@ -1566,7 +1566,7 @@ $output = check_plain($name); } } - else if ($object->name) { + elseif ($object->name) { // Sometimes modules display content composed by people who are // not registered members of the site (e.g. mailing list or news // aggregator modules). This clause enables modules to display Index: includes/unicode.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/unicode.inc,v retrieving revision 1.29 diff -u -r1.29 unicode.inc --- includes/unicode.inc 28 Dec 2007 12:02:50 -0000 1.29 +++ includes/unicode.inc 14 Jul 2008 12:37:29 -0000 @@ -174,10 +174,10 @@ if (function_exists('iconv')) { $out = @iconv($encoding, 'utf-8', $data); } - else if (function_exists('mb_convert_encoding')) { + elseif (function_exists('mb_convert_encoding')) { $out = @mb_convert_encoding($data, 'utf-8', $encoding); } - else if (function_exists('recode_string')) { + elseif (function_exists('recode_string')) { $out = @recode_string($encoding .'..utf-8', $data); } else { @@ -370,16 +370,16 @@ if ($codepoint < 0x80) { $str = chr($codepoint); } - else if ($codepoint < 0x800) { + elseif ($codepoint < 0x800) { $str = chr(0xC0 | ($codepoint >> 6)) . chr(0x80 | ($codepoint & 0x3F)); } - else if ($codepoint < 0x10000) { + elseif ($codepoint < 0x10000) { $str = chr(0xE0 | ( $codepoint >> 12)) . chr(0x80 | (($codepoint >> 6) & 0x3F)) . chr(0x80 | ( $codepoint & 0x3F)); } - else if ($codepoint < 0x200000) { + elseif ($codepoint < 0x200000) { $str = chr(0xF0 | ( $codepoint >> 18)) . chr(0x80 | (($codepoint >> 12) & 0x3F)) . chr(0x80 | (($codepoint >> 6) & 0x3F)) @@ -488,7 +488,7 @@ } } } - else if ($start < 0) { + elseif ($start < 0) { // Count all the continuation bytes from the end until we have found // abs($start) characters $start = abs($start); @@ -507,7 +507,7 @@ if ($length === NULL) { $bytes = $strlen - 1; } - else if ($length > 0) { + elseif ($length > 0) { // Count all the continuation bytes from the starting index until we have // found $length + 1 characters. Then backtrack one byte. $bytes = $istart; $chars = 0; @@ -520,7 +520,7 @@ } $bytes--; } - else if ($length < 0) { + elseif ($length < 0) { // Count all the continuation bytes from the end until we have found // abs($length) characters $length = abs($length); Index: modules/aggregator/aggregator.module =================================================================== RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v retrieving revision 1.374.2.2 diff -u -r1.374.2.2 aggregator.module --- modules/aggregator/aggregator.module 5 Jul 2008 05:57:33 -0000 1.374.2.2 +++ modules/aggregator/aggregator.module 14 Jul 2008 12:37:32 -0000 @@ -310,7 +310,7 @@ $block['feed-'. $feed->fid]['info'] = t('!title feed latest items', array('!title' => $feed->title)); } } - else if ($op == 'configure') { + elseif ($op == 'configure') { list($type, $id) = explode('-', $delta); if ($type == 'category') { $value = db_result(db_query('SELECT block FROM {aggregator_category} WHERE cid = %d', $id)); @@ -321,7 +321,7 @@ $form['block'] = array('#type' => 'select', '#title' => t('Number of news items in block'), '#default_value' => $value, '#options' => drupal_map_assoc(array(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20))); return $form; } - else if ($op == 'save') { + elseif ($op == 'save') { list($type, $id) = explode('-', $delta); if ($type == 'category') { $value = db_query('UPDATE {aggregator_category} SET block = %d WHERE cid = %d', $edit['block'], $id); @@ -330,7 +330,7 @@ $value = db_query('UPDATE {aggregator_feed} SET block = %d WHERE fid = %d', $edit['block'], $id); } } - else if ($op == 'view') { + elseif ($op == 'view') { list($type, $id) = explode('-', $delta); switch ($type) { case 'feed': @@ -385,7 +385,7 @@ $op = 'delete'; } } - else if (!empty($edit['title'])) { + elseif (!empty($edit['title'])) { // A single unique id for bundles and feeds, to use in blocks db_query("INSERT INTO {aggregator_category} (title, description, block) VALUES ('%s', '%s', 5)", $edit['title'], $edit['description']); $link_path .= db_last_insert_id('aggregator', 'cid'); @@ -410,7 +410,7 @@ if (!empty($edit['fid']) && !empty($edit['title'])) { db_query("UPDATE {aggregator_feed} SET title = '%s', url = '%s', refresh = %d WHERE fid = %d", $edit['title'], $edit['url'], $edit['refresh'], $edit['fid']); } - else if (!empty($edit['fid'])) { + elseif (!empty($edit['fid'])) { $items = array(); $result = db_query('SELECT iid FROM {aggregator_item} WHERE fid = %d', $edit['fid']); while ($item = db_fetch_object($result)) { @@ -422,7 +422,7 @@ db_query('DELETE FROM {aggregator_feed} WHERE fid = %d', $edit['fid']); db_query('DELETE FROM {aggregator_item} WHERE fid = %d', $edit['fid']); } - else if (!empty($edit['title'])) { + elseif (!empty($edit['title'])) { db_query("INSERT INTO {aggregator_feed} (title, url, refresh, block, description, image) VALUES ('%s', '%s', %d, 5, '', '')", $edit['title'], $edit['url'], $edit['refresh']); // A single unique id for bundles and feeds, to use in blocks. $edit['fid'] = db_last_insert_id('aggregator_feed', 'fid'); @@ -757,10 +757,10 @@ if (!empty($item['CONTENT:ENCODED'])) { $item['DESCRIPTION'] = $item['CONTENT:ENCODED']; } - else if (!empty($item['SUMMARY'])) { + elseif (!empty($item['SUMMARY'])) { $item['DESCRIPTION'] = $item['SUMMARY']; } - else if (!empty($item['CONTENT'])) { + elseif (!empty($item['CONTENT'])) { $item['DESCRIPTION'] = $item['CONTENT']; } @@ -788,7 +788,7 @@ if (!empty($guid)) { $entry = db_fetch_object(db_query("SELECT iid FROM {aggregator_item} WHERE fid = %d AND guid = '%s'", $feed['fid'], $guid)); } - else if ($link && $link != $feed['link'] && $link != $feed['url']) { + elseif ($link && $link != $feed['link'] && $link != $feed['url']) { $entry = db_fetch_object(db_query("SELECT iid FROM {aggregator_item} WHERE fid = %d AND link = '%s'", $feed['fid'], $link)); } else { @@ -826,11 +826,11 @@ if ($edit['iid'] && $edit['title']) { db_query("UPDATE {aggregator_item} SET title = '%s', link = '%s', author = '%s', description = '%s', guid = '%s', timestamp = %d WHERE iid = %d", $edit['title'], $edit['link'], $edit['author'], $edit['description'], $edit['guid'], $edit['timestamp'], $edit['iid']); } - else if ($edit['iid']) { + elseif ($edit['iid']) { db_query('DELETE FROM {aggregator_item} WHERE iid = %d', $edit['iid']); db_query('DELETE FROM {aggregator_category_item} WHERE iid = %d', $edit['iid']); } - else if ($edit['title'] && $edit['link']) { + elseif ($edit['title'] && $edit['link']) { db_query("INSERT INTO {aggregator_item} (fid, title, link, author, description, timestamp, guid) VALUES (%d, '%s', '%s', '%s', '%s', %d, '%s')", $edit['fid'], $edit['title'], $edit['link'], $edit['author'], $edit['description'], $edit['timestamp'], $edit['guid']); $edit['iid'] = db_last_insert_id('aggregator_item', 'iid'); // file the items in the categories indicated by the feed Index: modules/blog/blog.module =================================================================== RCS file: /cvs/drupal/drupal/modules/blog/blog.module,v retrieving revision 1.297.2.3 diff -u -r1.297.2.3 blog.module --- modules/blog/blog.module 19 May 2008 07:27:35 -0000 1.297.2.3 +++ modules/blog/blog.module 14 Jul 2008 12:37:33 -0000 @@ -196,7 +196,7 @@ $block[0]['info'] = t('Recent blog posts'); return $block; } - else if ($op == 'view') { + elseif ($op == 'view') { if (user_access('access content')) { $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.title, n.created FROM {node} n WHERE n.type = 'blog' AND n.status = 1 ORDER BY n.created DESC"), 0, 10); if ($node_title_list = node_title_list($result)) { Index: modules/blog/blog.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/blog/blog.pages.inc,v retrieving revision 1.6.2.1 diff -u -r1.6.2.1 blog.pages.inc --- modules/blog/blog.pages.inc 8 Feb 2008 21:15:12 -0000 1.6.2.1 +++ modules/blog/blog.pages.inc 14 Jul 2008 12:37:33 -0000 @@ -19,7 +19,7 @@ if (($account->uid == $user->uid) && user_access('create blog entries')) { $items[] = l(t('Post new blog entry.'), "node/add/blog"); } - else if ($account->uid == $user->uid) { + elseif ($account->uid == $user->uid) { $items[] = t('You are not allowed to post a new blog entry.'); } Index: modules/blogapi/blogapi.module =================================================================== RCS file: /cvs/drupal/drupal/modules/blogapi/blogapi.module,v retrieving revision 1.115.2.1 diff -u -r1.115.2.1 blogapi.module --- modules/blogapi/blogapi.module 7 Feb 2008 20:11:02 -0000 1.115.2.1 +++ modules/blogapi/blogapi.module 14 Jul 2008 12:37:34 -0000 @@ -685,7 +685,7 @@ if ($node->comment == 1) { $comment = 2; } - else if ($node->comment == 2) { + elseif ($node->comment == 2) { $comment = 1; } $xmlrpcval['content'] = "$node->title$node->body"; Index: modules/color/color.module =================================================================== RCS file: /cvs/drupal/drupal/modules/color/color.module,v retrieving revision 1.39 diff -u -r1.39 color.module --- modules/color/color.module 23 Jan 2008 09:43:25 -0000 1.39 +++ modules/color/color.module 14 Jul 2008 12:37:36 -0000 @@ -410,7 +410,7 @@ $base = 'link'; } // 'color:' styles. Use text. - else if (preg_match('/(? "comment/reply/$comment->nid/$comment->cid" ); } - else if (user_access('post comments')) { + elseif (user_access('post comments')) { if (comment_access('edit', $comment)) { $links['comment_edit'] = array( 'title' => t('edit'), @@ -972,7 +972,7 @@ $query .= ' ORDER BY c.thread DESC'; } } - else if ($order == COMMENT_ORDER_OLDEST_FIRST) { + elseif ($order == COMMENT_ORDER_OLDEST_FIRST) { if ($mode == COMMENT_MODE_FLAT_COLLAPSED || $mode == COMMENT_MODE_FLAT_EXPANDED) { $query .= ' ORDER BY c.cid'; } @@ -1014,13 +1014,13 @@ if ($mode == COMMENT_MODE_FLAT_COLLAPSED) { $comments .= theme('comment_flat_collapsed', $comment, $node); } - else if ($mode == COMMENT_MODE_FLAT_EXPANDED) { + elseif ($mode == COMMENT_MODE_FLAT_EXPANDED) { $comments .= theme('comment_flat_expanded', $comment, $node); } - else if ($mode == COMMENT_MODE_THREADED_COLLAPSED) { + elseif ($mode == COMMENT_MODE_THREADED_COLLAPSED) { $comments .= theme('comment_thread_collapsed', $comment, $node); } - else if ($mode == COMMENT_MODE_THREADED_EXPANDED) { + elseif ($mode == COMMENT_MODE_THREADED_EXPANDED) { $comments .= theme('comment_thread_expanded', $comment, $node); } @@ -1071,7 +1071,7 @@ 'delete' => array(t('Delete the selected comments'), '') ); } - else if ($action == 'unpublish') { + elseif ($action == 'unpublish') { $operations = array( 'unpublish' => array(t('Unpublish the selected comments'), 'UPDATE {comments} SET status = '. COMMENT_NOT_PUBLISHED .' WHERE cid = %d'), 'delete' => array(t('Delete the selected comments'), '') @@ -1205,7 +1205,7 @@ } } - else if (variable_get('comment_anonymous_'. $node->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT) == COMMENT_ANONYMOUS_MUST_CONTACT) { + elseif (variable_get('comment_anonymous_'. $node->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT) == COMMENT_ANONYMOUS_MUST_CONTACT) { form_set_error('name', t('You have to leave your name.')); } @@ -1214,7 +1214,7 @@ form_set_error('mail', t('The e-mail address you specified is not valid.')); } } - else if (variable_get('comment_anonymous_'. $node->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT) == COMMENT_ANONYMOUS_MUST_CONTACT) { + elseif (variable_get('comment_anonymous_'. $node->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT) == COMMENT_ANONYMOUS_MUST_CONTACT) { form_set_error('mail', t('You have to leave an e-mail address.')); } @@ -1337,7 +1337,7 @@ $form['author'] = array('#type' => 'value', '#value' => $user->name); } } - else if (variable_get('comment_anonymous_'. $node->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT) == COMMENT_ANONYMOUS_MAY_CONTACT) { + elseif (variable_get('comment_anonymous_'. $node->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT) == COMMENT_ANONYMOUS_MAY_CONTACT) { $form['name'] = array('#type' => 'textfield', '#title' => t('Your name'), '#maxlength' => 60, '#size' => 30, '#default_value' => $edit['name'] ? $edit['name'] : variable_get('anonymous', t('Anonymous')) ); @@ -1346,7 +1346,7 @@ $form['homepage'] = array('#type' => 'textfield', '#title' => t('Homepage'), '#maxlength' => 255, '#size' => 30, '#default_value' => $edit['homepage']); } - else if (variable_get('comment_anonymous_'. $node->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT) == COMMENT_ANONYMOUS_MUST_CONTACT) { + elseif (variable_get('comment_anonymous_'. $node->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT) == COMMENT_ANONYMOUS_MUST_CONTACT) { $form['name'] = array('#type' => 'textfield', '#title' => t('Your name'), '#maxlength' => 60, '#size' => 30, '#default_value' => $edit['name'] ? $edit['name'] : variable_get('anonymous', t('Anonymous')), '#required' => TRUE); $form['mail'] = array('#type' => 'textfield', '#title' => t('E-mail'), '#maxlength' => 64, '#size' => 30, '#default_value' => $edit['mail'], '#description' => t('The content of this field is kept private and will not be shown publicly.'), '#required' => TRUE); @@ -1902,7 +1902,7 @@ if (isset($user->$setting) && $user->$setting) { $value = $user->$setting; } - else if (isset($_SESSION['comment_'. $setting]) && $_SESSION['comment_'. $setting]) { + elseif (isset($_SESSION['comment_'. $setting]) && $_SESSION['comment_'. $setting]) { $value = $_SESSION['comment_'. $setting]; } else { @@ -1957,7 +1957,7 @@ if (isset($result) && is_array($result)) { $return = array_merge($return, $result); } - else if (isset($result)) { + elseif (isset($result)) { $return[] = $result; } } Index: modules/comment/comment.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.pages.inc,v retrieving revision 1.2.2.1 diff -u -r1.2.2.1 comment.pages.inc --- modules/comment/comment.pages.inc 7 Feb 2008 18:53:38 -0000 1.2.2.1 +++ modules/comment/comment.pages.inc 14 Jul 2008 12:37:38 -0000 @@ -89,7 +89,7 @@ } } // This is the case where the comment is in response to a node. Display the node. - else if (user_access('access content')) { + elseif (user_access('access content')) { $output .= node_view($node); } @@ -98,7 +98,7 @@ drupal_set_message(t("This discussion is closed: you can't post new comments."), 'error'); drupal_goto("node/$node->nid"); } - else if (user_access('post comments')) { + elseif (user_access('post comments')) { $output .= comment_form_box(array('pid' => $pid, 'nid' => $node->nid), t('Reply')); } else { Index: modules/contact/contact.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/contact/contact.pages.inc,v retrieving revision 1.6.2.1 diff -u -r1.6.2.1 contact.pages.inc --- modules/contact/contact.pages.inc 12 Feb 2008 14:42:50 -0000 1.6.2.1 +++ modules/contact/contact.pages.inc 14 Jul 2008 12:37:39 -0000 @@ -160,7 +160,7 @@ if (!valid_email_address($user->mail)) { $output = t('You need to provide a valid e-mail address to contact other users. Please update your user information and try again.', array('@url' => url("user/$user->uid/edit"))); } - else if (!flood_is_allowed('contact', variable_get('contact_hourly_threshold', 3))) { + elseif (!flood_is_allowed('contact', variable_get('contact_hourly_threshold', 3))) { $output = t('You cannot contact more than %number users per hour. Please try again later.', array('%number' => variable_get('contact_hourly_threshold', 3))); } else { Index: modules/filter/filter.module =================================================================== RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v retrieving revision 1.204.2.2 diff -u -r1.204.2.2 filter.module --- modules/filter/filter.module 9 Jul 2008 21:48:28 -0000 1.204.2.2 +++ modules/filter/filter.module 14 Jul 2008 12:37:41 -0000 @@ -893,12 +893,12 @@ } } // Only allow a matching tag to close it. - else if (!$open && $ignoretag == $tag) { + elseif (!$open && $ignoretag == $tag) { $ignore = FALSE; $ignoretag = ''; } } - else if (!$ignore) { + elseif (!$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 @@ -1016,7 +1016,7 @@ // We matched a lone ">" character return '>'; } - else if (strlen($string) == 1) { + elseif (strlen($string) == 1) { // We matched a lone "<" character return '<'; } Index: modules/forum/forum.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/forum/forum.admin.inc,v retrieving revision 1.8 diff -u -r1.8 forum.admin.inc --- modules/forum/forum.admin.inc 30 Jan 2008 10:14:42 -0000 1.8 +++ modules/forum/forum.admin.inc 14 Jul 2008 12:37:41 -0000 @@ -285,7 +285,7 @@ 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.'); } - else if ($child_type == 'forum') { + elseif ($child_type == 'forum') { $description = t('Forums may be placed at the top (root) level, or inside another container or forum.'); } Index: modules/locale/locale.module =================================================================== RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v retrieving revision 1.212.2.2 diff -u -r1.212.2.2 locale.module --- modules/locale/locale.module 9 Jul 2008 21:48:28 -0000 1.212.2.2 +++ modules/locale/locale.module 14 Jul 2008 12:37:43 -0000 @@ -545,7 +545,7 @@ } // 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. - else if ($new_files) { + elseif ($new_files) { variable_set('javascript_parsed', $parsed); } Index: modules/menu/menu.module =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v retrieving revision 1.157.2.3 diff -u -r1.157.2.3 menu.module --- modules/menu/menu.module 10 May 2008 06:53:53 -0000 1.157.2.3 +++ modules/menu/menu.module 14 Jul 2008 12:37:44 -0000 @@ -281,7 +281,7 @@ } return $blocks; } - else if ($op == 'view') { + elseif ($op == 'view') { $data['subject'] = check_plain($menus[$delta]); $data['content'] = menu_tree($delta); return $data; Index: modules/node/node.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.admin.inc,v retrieving revision 1.19.2.1 diff -u -r1.19.2.1 node.admin.inc --- modules/node/node.admin.inc 21 Mar 2008 22:01:05 -0000 1.19.2.1 +++ modules/node/node.admin.inc 14 Jul 2008 12:37:45 -0000 @@ -229,7 +229,7 @@ $value = module_invoke('taxonomy', 'get_term', $value); $value = $value->name; } - else if ($type == 'language') { + elseif ($type == 'language') { $value = empty($value) ? t('Language neutral') : module_invoke('locale', 'language_name', $value); } else { Index: modules/node/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.module,v retrieving revision 1.947.2.11 diff -u -r1.947.2.11 node.module --- modules/node/node.module 25 Jun 2008 08:59:57 -0000 1.947.2.11 +++ modules/node/node.module 14 Jul 2008 12:37:48 -0000 @@ -674,7 +674,7 @@ if (isset($result) && is_array($result)) { $return = array_merge($return, $result); } - else if (isset($result)) { + elseif (isset($result)) { $return[] = $result; } } @@ -1626,7 +1626,7 @@ $blocks[0]['cache'] = BLOCK_NO_CACHE; return $blocks; } - else if ($op == 'view') { + elseif ($op == 'view') { $block['subject'] = t('Syndicate'); $block['content'] = theme('feed_icon', url('rss.xml'), t('Syndicate')); Index: modules/node/node.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.pages.inc,v retrieving revision 1.28.2.1 diff -u -r1.28.2.1 node.pages.inc --- modules/node/node.pages.inc 27 Feb 2008 19:44:44 -0000 1.28.2.1 +++ modules/node/node.pages.inc 14 Jul 2008 12:37:48 -0000 @@ -373,7 +373,7 @@ $node->uid = 0; // anonymous user } } - else if ($node->uid) { + elseif ($node->uid) { $user = user_load(array('uid' => $node->uid)); $node->name = $user->name; $node->picture = $user->picture; Index: modules/openid/openid.module =================================================================== RCS file: /cvs/drupal/drupal/modules/openid/openid.module,v retrieving revision 1.19.2.3 diff -u -r1.19.2.3 openid.module --- modules/openid/openid.module 9 Jul 2008 21:48:28 -0000 1.19.2.3 +++ modules/openid/openid.module 14 Jul 2008 12:37:49 -0000 @@ -185,7 +185,7 @@ if (!empty($services[0]['localid'])) { $identity = $services[0]['localid']; } - else if (!empty($services[0]['delegate'])) { + elseif (!empty($services[0]['delegate'])) { $identity = $services[0]['delegate']; } else { Index: modules/path/path.module =================================================================== RCS file: /cvs/drupal/drupal/modules/path/path.module,v retrieving revision 1.138.2.2 diff -u -r1.138.2.2 path.module --- modules/path/path.module 21 Jun 2008 18:22:53 -0000 1.138.2.2 +++ modules/path/path.module 14 Jul 2008 12:37:49 -0000 @@ -100,7 +100,7 @@ db_query("UPDATE {url_alias} SET src = '%s', dst = '%s', language = '%s' WHERE pid = %d", $path, $alias, $language, $pid); } } - else if ($path && $alias) { + elseif ($path && $alias) { // Check for existing aliases. if ($alias == drupal_get_path_alias($path, $language)) { // There is already such an alias, neutral or in this language. Index: modules/poll/poll.module =================================================================== RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v retrieving revision 1.263.2.1 diff -u -r1.263.2.1 poll.module --- modules/poll/poll.module 25 Apr 2008 20:39:55 -0000 1.263.2.1 +++ modules/poll/poll.module 14 Jul 2008 12:37:50 -0000 @@ -133,7 +133,7 @@ $blocks[0]['info'] = t('Most recent poll'); return $blocks; } - else if ($op == 'view') { + elseif ($op == 'view') { // Retrieve the latest poll. $sql = db_rewrite_sql("SELECT MAX(n.created) FROM {node} n INNER JOIN {poll} p ON p.nid = n.nid WHERE n.status = 1 AND p.active = 1"); $timestamp = db_result(db_query($sql)); Index: modules/profile/profile.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/profile/profile.admin.inc,v retrieving revision 1.8 diff -u -r1.8 profile.admin.inc --- modules/profile/profile.admin.inc 21 Jan 2008 15:20:43 -0000 1.8 +++ modules/profile/profile.admin.inc 14 Jul 2008 12:37:51 -0000 @@ -254,7 +254,7 @@ '#description' => t('To enable browsing this field by value, enter a title for the resulting page. The word %value will be substituted with the corresponding value. An example page title is "People whose favorite color is %value". This is only applicable for a public field.'), ); } - else if ($type == 'checkbox') { + elseif ($type == 'checkbox') { $form['fields']['page'] = array('#type' => 'textfield', '#title' => t('Page title'), '#default_value' => $edit['page'], Index: modules/profile/profile.module =================================================================== RCS file: /cvs/drupal/drupal/modules/profile/profile.module,v retrieving revision 1.236.2.2 diff -u -r1.236.2.2 profile.module --- modules/profile/profile.module 28 Apr 2008 09:13:46 -0000 1.236.2.2 +++ modules/profile/profile.module 14 Jul 2008 12:37:52 -0000 @@ -142,7 +142,7 @@ $blocks[0]['cache'] = BLOCK_CACHE_PER_PAGE | BLOCK_CACHE_PER_ROLE; return $blocks; } - else if ($op == 'configure' && $delta == 0) { + elseif ($op == 'configure' && $delta == 0) { // Compile a list of fields to show $fields = array(); $result = db_query('SELECT name, title, weight, visibility FROM {profile_fields} WHERE visibility IN (%d, %d) ORDER BY weight', PROFILE_PUBLIC, PROFILE_PUBLIC_LISTINGS); @@ -158,10 +158,10 @@ ); return $form; } - else if ($op == 'save' && $delta == 0) { + elseif ($op == 'save' && $delta == 0) { variable_set('profile_block_author_fields', $edit['profile_block_author_fields']); } - else if ($op == 'view') { + elseif ($op == 'view') { if (user_access('access user profiles')) { $output = ''; if ((arg(0) == 'node') && is_numeric(arg(1)) && (arg(2) == NULL)) { @@ -440,7 +440,7 @@ } } } - else if ($field->required && !user_access('administer users')) { + elseif ($field->required && !user_access('administer users')) { form_set_error($field->name, t('The field %field is required.', array('%field' => $field->title))); } } Index: modules/profile/profile.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/profile/profile.pages.inc,v retrieving revision 1.2 diff -u -r1.2 profile.pages.inc --- modules/profile/profile.pages.inc 8 Dec 2007 14:06:22 -0000 1.2 +++ modules/profile/profile.pages.inc 14 Jul 2008 12:37:52 -0000 @@ -76,7 +76,7 @@ drupal_set_title($title); return $output; } - else if ($name && !$field->fid) { + elseif ($name && !$field->fid) { drupal_not_found(); } else { Index: modules/search/search.module =================================================================== RCS file: /cvs/drupal/drupal/modules/search/search.module,v retrieving revision 1.250.2.2 diff -u -r1.250.2.2 search.module --- modules/search/search.module 9 Apr 2008 21:11:49 -0000 1.250.2.2 +++ modules/search/search.module 14 Jul 2008 12:37:53 -0000 @@ -154,7 +154,7 @@ $blocks[0]['cache'] = BLOCK_NO_CACHE; return $blocks; } - else if ($op == 'view' && user_access('search content')) { + elseif ($op == 'view' && user_access('search content')) { $block['content'] = drupal_get_form('search_block_form'); $block['subject'] = t('Search'); return $block; Index: modules/system/system.install =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.install,v retrieving revision 1.238.2.3 diff -u -r1.238.2.3 system.install --- modules/system/system.install 25 Apr 2008 21:24:20 -0000 1.238.2.3 +++ modules/system/system.install 14 Jul 2008 12:37:58 -0000 @@ -146,7 +146,7 @@ if (time() - $cron_last > $threshold_error) { $severity = REQUIREMENT_ERROR; } - else if ($never_run || (time() - $cron_last > $threshold_warning)) { + elseif ($never_run || (time() - $cron_last > $threshold_warning)) { $severity = REQUIREMENT_WARNING; } Index: modules/taxonomy/taxonomy.module =================================================================== RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v retrieving revision 1.414.2.4 diff -u -r1.414.2.4 taxonomy.module --- modules/taxonomy/taxonomy.module 25 Jun 2008 08:00:57 -0000 1.414.2.4 +++ modules/taxonomy/taxonomy.module 14 Jul 2008 12:38:02 -0000 @@ -211,7 +211,7 @@ module_invoke_all('taxonomy', 'update', 'vocabulary', $edit); $status = SAVED_UPDATED; } - else if (!empty($edit['vid'])) { + elseif (!empty($edit['vid'])) { $status = taxonomy_del_vocabulary($edit['vid']); } else { @@ -312,7 +312,7 @@ $hook = 'update'; $status = SAVED_UPDATED; } - else if (!empty($form_values['tid'])) { + elseif (!empty($form_values['tid'])) { return taxonomy_del_term($form_values['tid']); } else { @@ -695,10 +695,10 @@ } } } - else if (is_object($term)) { + elseif (is_object($term)) { db_query('INSERT INTO {term_node} (nid, vid, tid) VALUES (%d, %d, %d)', $node->nid, $node->vid, $term->tid); } - else if ($term) { + elseif ($term) { db_query('INSERT INTO {term_node} (nid, vid, tid) VALUES (%d, %d, %d)', $node->nid, $node->vid, $term); } } @@ -1212,7 +1212,7 @@ // The '+' character in a query string may be parsed as ' '. $terms['tids'] = preg_split('/[+ ]/', $str_tids); } - else if (preg_match('/^([0-9]+,)*[0-9]+$/', $str_tids)) { + elseif (preg_match('/^([0-9]+,)*[0-9]+$/', $str_tids)) { $terms['operator'] = 'and'; $terms['tids'] = explode(',', $str_tids); } Index: modules/user/user.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v retrieving revision 1.18 diff -u -r1.18 user.admin.inc --- modules/user/user.admin.inc 16 Jan 2008 22:54:41 -0000 1.18 +++ modules/user/user.admin.inc 14 Jul 2008 12:38:07 -0000 @@ -664,7 +664,7 @@ form_set_error('name', t('The role name %name already exists. Please choose another role name.', array('%name' => $form_state['values']['name']))); } } - else if ($form_state['values']['op'] == t('Add role')) { + elseif ($form_state['values']['op'] == t('Add role')) { if (db_result(db_query("SELECT COUNT(*) FROM {role} WHERE name = '%s'", $form_state['values']['name']))) { form_set_error('name', t('The role name %name already exists. Please choose another role name.', array('%name' => $form_state['values']['name']))); } @@ -680,7 +680,7 @@ db_query("UPDATE {role} SET name = '%s' WHERE rid = %d", $form_state['values']['name'], $form_state['values']['rid']); drupal_set_message(t('The role has been renamed.')); } - else if ($form_state['values']['op'] == t('Delete role')) { + elseif ($form_state['values']['op'] == t('Delete role')) { db_query('DELETE FROM {role} WHERE rid = %d', $form_state['values']['rid']); db_query('DELETE FROM {permission} WHERE rid = %d', $form_state['values']['rid']); // Update the users who have this role set: @@ -688,7 +688,7 @@ drupal_set_message(t('The role has been deleted.')); } - else if ($form_state['values']['op'] == t('Add role')) { + elseif ($form_state['values']['op'] == t('Add role')) { db_query("INSERT INTO {role} (name) VALUES ('%s')", $form_state['values']['name']); drupal_set_message(t('The role has been added.')); } Index: modules/user/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.module,v retrieving revision 1.892.2.5 diff -u -r1.892.2.5 user.module --- modules/user/user.module 9 Jul 2008 21:48:28 -0000 1.892.2.5 +++ modules/user/user.module 14 Jul 2008 12:38:09 -0000 @@ -155,7 +155,7 @@ $query[] = "$key = %d"; $params[] = $value; } - else if ($key == 'pass') { + elseif ($key == 'pass') { $query[] = "pass = '%s'"; $params[] = md5($value); } @@ -224,13 +224,13 @@ $query .= "$key = '%s', "; $v[] = md5($value); } - else if ((substr($key, 0, 4) !== 'auth') && ($key != 'pass')) { + elseif ((substr($key, 0, 4) !== 'auth') && ($key != 'pass')) { if (in_array($key, $user_fields)) { // Save standard fields. $query .= "$key = '%s', "; $v[] = $value; } - else if ($key != 'roles') { + elseif ($key != 'roles') { // Roles is a special case: it used below. if ($value === NULL) { unset($data[$key]); @@ -694,7 +694,7 @@ $blocks[3]['cache'] = BLOCK_NO_CACHE; return $blocks; } - else if ($op == 'configure' && $delta == 2) { + elseif ($op == 'configure' && $delta == 2) { $form['user_block_whois_new_count'] = array( '#type' => 'select', '#title' => t('Number of users to display'), @@ -703,21 +703,21 @@ ); return $form; } - else if ($op == 'configure' && $delta == 3) { + elseif ($op == 'configure' && $delta == 3) { $period = drupal_map_assoc(array(30, 60, 120, 180, 300, 600, 900, 1800, 2700, 3600, 5400, 7200, 10800, 21600, 43200, 86400), 'format_interval'); $form['user_block_seconds_online'] = array('#type' => 'select', '#title' => t('User activity'), '#default_value' => variable_get('user_block_seconds_online', 900), '#options' => $period, '#description' => t('A user is considered online for this long after they have last viewed a page.')); $form['user_block_max_list_count'] = array('#type' => 'select', '#title' => t('User list length'), '#default_value' => variable_get('user_block_max_list_count', 10), '#options' => drupal_map_assoc(array(0, 5, 10, 15, 20, 25, 30, 40, 50, 75, 100)), '#description' => t('Maximum number of currently online users to display.')); return $form; } - else if ($op == 'save' && $delta == 2) { + elseif ($op == 'save' && $delta == 2) { variable_set('user_block_whois_new_count', $edit['user_block_whois_new_count']); } - else if ($op == 'save' && $delta == 3) { + elseif ($op == 'save' && $delta == 3) { variable_set('user_block_seconds_online', $edit['user_block_seconds_online']); variable_set('user_block_max_list_count', $edit['user_block_max_list_count']); } - else if ($op == 'view') { + elseif ($op == 'view') { $block = array(); switch ($delta) { @@ -808,7 +808,7 @@ if (!empty($account->picture) && file_exists($account->picture)) { $picture = file_create_url($account->picture); } - else if (variable_get('user_picture_default', '')) { + elseif (variable_get('user_picture_default', '')) { $picture = variable_get('user_picture_default', ''); } @@ -1294,7 +1294,7 @@ // blocked in user administration form_set_error('name', t('The username %name has not been activated or is blocked.', array('%name' => $form_state['values']['name']))); } - else if (drupal_is_denied('user', $form_state['values']['name'])) { + elseif (drupal_is_denied('user', $form_state['values']['name'])) { // denied by access controls form_set_error('name', t('The name %name is a reserved username.', array('%name' => $form_state['values']['name']))); } @@ -1534,10 +1534,10 @@ if ($error = user_validate_name($edit['name'])) { form_set_error('name', $error); } - else if (db_result(db_query("SELECT COUNT(*) FROM {users} WHERE uid != %d AND LOWER(name) = LOWER('%s')", $uid, $edit['name'])) > 0) { + elseif (db_result(db_query("SELECT COUNT(*) FROM {users} WHERE uid != %d AND LOWER(name) = LOWER('%s')", $uid, $edit['name'])) > 0) { form_set_error('name', t('The name %name is already taken.', array('%name' => $edit['name']))); } - else if (drupal_is_denied('user', $edit['name'])) { + elseif (drupal_is_denied('user', $edit['name'])) { form_set_error('name', t('The name %name has been denied access.', array('%name' => $edit['name']))); } } @@ -1546,10 +1546,10 @@ if ($error = user_validate_mail($edit['mail'])) { form_set_error('mail', $error); } - else if (db_result(db_query("SELECT COUNT(*) FROM {users} WHERE uid != %d AND LOWER(mail) = LOWER('%s')", $uid, $edit['mail'])) > 0) { + elseif (db_result(db_query("SELECT COUNT(*) FROM {users} WHERE uid != %d AND LOWER(mail) = LOWER('%s')", $uid, $edit['mail'])) > 0) { form_set_error('mail', t('The e-mail address %email is already registered. Have you forgotten your password?', array('%email' => $edit['mail'], '@password' => url('user/password')))); } - else if (drupal_is_denied('mail', $edit['mail'])) { + elseif (drupal_is_denied('mail', $edit['mail'])) { form_set_error('mail', t('The e-mail address %email has been denied access.', array('%email' => $edit['mail']))); } } @@ -2324,7 +2324,7 @@ if ($admin && !$notify) { drupal_set_message(t('Created a new user account for %name. No e-mail has been sent.', array('@url' => url("user/$account->uid"), '%name' => $account->name))); } - else if (!variable_get('user_email_verification', TRUE) && $account->status && !$admin) { + elseif (!variable_get('user_email_verification', TRUE) && $account->status && !$admin) { // No e-mail verification is required, create new user account, and login // user immediately. _user_mail_notify('register_no_approval_required', $account); @@ -2334,7 +2334,7 @@ $form_state['redirect'] = ''; return; } - else if ($account->status || $notify) { + elseif ($account->status || $notify) { // Create new user account, no administrator approval required. $op = $notify ? 'register_admin_created' : 'register_no_approval_required'; _user_mail_notify($op, $account); Index: modules/user/user.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.pages.inc,v retrieving revision 1.11 diff -u -r1.11 user.pages.inc --- modules/user/user.pages.inc 8 Jan 2008 10:35:43 -0000 1.11 +++ modules/user/user.pages.inc 14 Jul 2008 12:38:09 -0000 @@ -92,7 +92,7 @@ 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'); } - else if ($account->uid && $timestamp > $account->login && $timestamp < $current && $hashed_pass == user_pass_rehash($account->pass, $timestamp, $account->login)) { + elseif ($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)); Index: scripts/drupal.sh =================================================================== RCS file: /cvs/drupal/drupal/scripts/drupal.sh,v retrieving revision 1.4 diff -u -r1.4 drupal.sh --- scripts/drupal.sh 2 Jul 2007 14:41:37 -0000 1.4 +++ scripts/drupal.sh 14 Jul 2008 12:38:09 -0000 @@ -118,7 +118,7 @@ $_SERVER['PHP_SELF'] = $_SERVER['REQUEST_URI'] = $path['path']; $cmd = substr($path['path'], 1); } - else if (isset($path['path'])) { + elseif (isset($path['path'])) { if (!isset($_GET['q'])) { $_REQUEST['q'] = $_GET['q'] = $path['path']; }