? drupal_forms_collapsible_0.patch
? files
? modules/aggregator2
? modules/module_builder
? sites/localhost.head
Index: update.php
===================================================================
RCS file: /cvs/drupal/drupal/update.php,v
retrieving revision 1.178
diff -u -r1.178 update.php
--- update.php	11 Mar 2006 13:45:41 -0000	1.178
+++ update.php	14 Mar 2006 06:01:04 -0000
@@ -57,7 +57,7 @@
       $default_val = 'NULL';
       $default = 'default NULL';
     }
-    elseif ($attributes['default'] === FALSE) {
+    else if ($attributes['default'] === FALSE) {
       $default = '';
     }
     else {
@@ -109,7 +109,7 @@
       $default_val = 'NULL';
       $default = 'default NULL';
     }
-    elseif ($attributes['default'] === FALSE) {
+    else if ($attributes['default'] === FALSE) {
       $default = '';
     }
     else {
@@ -218,7 +218,7 @@
     if ($GLOBALS['db_type'] == 'mysql') {
       db_query("ALTER TABLE {sessions} ADD cache int(11) NOT NULL default '0' AFTER timestamp");
     }
-    elseif ($GLOBALS['db_type'] == 'pgsql') {
+    else if ($GLOBALS['db_type'] == 'pgsql') {
       db_add_column($ret, 'sessions', 'cache', 'int', array('default' => 0, 'not null' => TRUE));
     }
 
Index: database/updates.inc
===================================================================
RCS file: /cvs/drupal/drupal/database/updates.inc,v
retrieving revision 1.218
diff -u -r1.218 updates.inc
--- database/updates.inc	12 Mar 2006 22:25:00 -0000	1.218
+++ database/updates.inc	14 Mar 2006 06:01:04 -0000
@@ -38,7 +38,7 @@
     $ret[] = update_sql('ALTER TABLE {blocks} ADD visibility tinyint(1) NOT NULL');
     $ret[] = update_sql('ALTER TABLE {blocks} ADD pages text NOT NULL');
   }
-  elseif ($GLOBALS['db_type'] == 'pgsql') {
+  else if ($GLOBALS['db_type'] == 'pgsql') {
     /*
     ** Search
     */
@@ -93,7 +93,7 @@
   if ($GLOBALS['db_type'] == 'mysql') {
     $ret[] = update_sql('ALTER TABLE {sessions} ADD PRIMARY KEY sid (sid)');
   }
-  elseif ($GLOBALS['db_type'] == 'pgsql') {
+  else if ($GLOBALS['db_type'] == 'pgsql') {
     $ret[] = update_sql('ALTER TABLE {sessions} ADD UNIQUE(sid)');
   }
 
@@ -110,7 +110,7 @@
       timestamp int(11) NOT NULL default '0'
      );");
   }
-  elseif ($GLOBALS['db_type'] == 'pgsql') {
+  else if ($GLOBALS['db_type'] == 'pgsql') {
     $ret[] = update_sql("CREATE TABLE {flood} (
       event varchar(64) NOT NULL default '',
       hostname varchar(128) NOT NULL default '',
@@ -127,7 +127,7 @@
   if ($GLOBALS['db_type'] == 'mysql') {
     $ret[] = update_sql('ALTER TABLE {accesslog} ADD aid int(10) NOT NULL auto_increment, ADD PRIMARY KEY (aid)');
   }
-  elseif ($GLOBALS['db_type'] == 'pgsql') {
+  else if ($GLOBALS['db_type'] == 'pgsql') {
     $ret[] = update_sql("SELECT * INTO TEMPORARY {accesslog}_t FROM {accesslog}");
     $ret[] = update_sql("DROP TABLE {accesslog}");
     $ret[] = update_sql("CREATE TABLE {accesslog} (
@@ -324,7 +324,7 @@
   if ($GLOBALS['db_type'] == 'mysql') {
     $ret[] = update_sql("ALTER TABLE {vocabulary} ADD module varchar(255) NOT NULL default ''");
   }
-  elseif ($GLOBALS['db_type'] == 'pgsql') {
+  else if ($GLOBALS['db_type'] == 'pgsql') {
     $ret[] = update_sql("ALTER TABLE {vocabulary} ADD module varchar(255)");
     $ret[] = update_sql("UPDATE {vocabulary} SET module = ''");
     $ret[] = update_sql("ALTER TABLE {vocabulary} ALTER COLUMN module SET NOT NULL");
@@ -432,7 +432,7 @@
   if ($GLOBALS['db_type'] == 'mysql') {
     $ret[] = update_sql('ALTER TABLE {term_node} ADD PRIMARY KEY (tid,nid)');
   }
-  elseif ($GLOBALS['db_type'] == 'pgsql') {
+  else if ($GLOBALS['db_type'] == 'pgsql') {
     $ret[] = update_sql('ALTER TABLE {term_node} ADD PRIMARY KEY (tid,nid)');
   }
 
@@ -445,7 +445,7 @@
   if ($GLOBALS['db_type'] == 'mysql') {
     $ret[] = update_sql("ALTER TABLE {vocabulary} ADD tags tinyint(3) unsigned default '0' NOT NULL");
   }
-  elseif ($GLOBALS['db_type'] == 'pgsql') {
+  else if ($GLOBALS['db_type'] == 'pgsql') {
     db_add_column($ret, 'vocabulary', 'tags', 'smallint', array('default' => 0, 'not null' => TRUE));
   }
 
@@ -468,7 +468,7 @@
     $ret[] = update_sql("ALTER TABLE {boxes} DROP INDEX title");
     // Removed recreation of the index, which is not present in the db schema
   }
-  elseif ($GLOBALS['db_type'] == 'pgsql') {
+  else if ($GLOBALS['db_type'] == 'pgsql') {
     $ret[] = update_sql("ALTER TABLE {boxes} DROP CONSTRAINT {boxes}_title_key");
   }
 
@@ -513,7 +513,7 @@
       )");
     $ret[] = update_sql("ALTER TABLE {users} ADD login int(11) NOT NULL default '0'");
   }
-  elseif ($GLOBALS['db_type'] == 'pgsql') {
+  else if ($GLOBALS['db_type'] == 'pgsql') {
     // Table {contact} is changed in update_143() so I have moved it's creation there.
     // It was never created here for postgres because of errors.
 
@@ -569,7 +569,7 @@
     if ($GLOBALS['db_type'] == 'mysql') {
       $ret[] = update_sql("ALTER TABLE {locales_source} CHANGE location location varchar(255) NOT NULL default ''");
     }
-    elseif ($GLOBALS['db_type'] == 'pgsql') {
+    else if ($GLOBALS['db_type'] == 'pgsql') {
       db_change_column($ret, 'locales_source', 'location', 'location', 'varchar(255)', array('not null' => TRUE, 'default' => "''"));
     }
     variable_del('update_137_done');
@@ -606,7 +606,7 @@
   if ($GLOBALS['db_type'] == 'mysql') {
     $ret[] = update_sql("ALTER TABLE {url_alias} ADD INDEX (src)");
   }
-  elseif ($GLOBALS['db_type'] == 'pgsql') {
+  else if ($GLOBALS['db_type'] == 'pgsql') {
     $ret[] = update_sql("CREATE INDEX {url_alias}_src_idx ON {url_alias}(src)");
   }
   return $ret;
@@ -636,7 +636,7 @@
     $ret[] = update_sql("ALTER TABLE {contact} CHANGE subject category VARCHAR(255) NOT NULL ");
     $ret[] = update_sql("ALTER TABLE {contact} ADD PRIMARY KEY (category)");
   }
-  elseif ($GLOBALS['db_type'] == 'pgsql') {
+  else if ($GLOBALS['db_type'] == 'pgsql') {
     // Why the table is created here? See update_133().
     $ret[] = update_sql("CREATE TABLE {contact} (
       category varchar(255) NOT NULL default '',
@@ -653,7 +653,7 @@
   if ($GLOBALS['db_type'] == 'mysql') {
     $ret[] = update_sql("ALTER TABLE {node} CHANGE type type VARCHAR(32) NOT NULL");
   }
-  elseif ($GLOBALS['db_type'] == 'pgsql') {
+  else if ($GLOBALS['db_type'] == 'pgsql') {
     $ret[] = update_sql("DROP INDEX {node}_type_idx"); // Drop indexes using "type" column
     $ret[] = update_sql("DROP INDEX {node}_title_idx");
     db_change_column($ret, 'node', 'type', 'type', 'varchar(32)', array('not null' => TRUE, 'default' => "''"));
Index: includes/bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.88
diff -u -r1.88 bootstrap.inc
--- includes/bootstrap.inc	27 Feb 2006 13:46:01 -0000	1.88
+++ includes/bootstrap.inc	14 Mar 2006 06:01:04 -0000
@@ -157,10 +157,10 @@
   if (!empty($filename) && file_exists($filename)) {
     $files[$type][$name] = $filename;
   }
-  elseif (isset($files[$type][$name])) {
+  else if (isset($files[$type][$name])) {
     // nothing
   }
-  elseif (($file = db_result(db_query("SELECT filename FROM {system} WHERE name = '%s' AND type = '%s'", $name, $type))) && file_exists($file)) {
+  else if (($file = db_result(db_query("SELECT filename FROM {system} WHERE name = '%s' AND type = '%s'", $name, $type))) && file_exists($file)) {
     $files[$type][$name] = $file;
   }
   else {
@@ -484,7 +484,7 @@
         // Strip the gzip header and run uncompress.
         $cache->data = gzinflate(substr(substr($cache->data, 10), 0, -8));
       }
-      elseif (function_exists('gzencode')) {
+      else if (function_exists('gzencode')) {
         header('Content-Encoding: gzip');
       }
 
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.526
diff -u -r1.526 common.inc
--- includes/common.inc	10 Mar 2006 17:06:48 -0000	1.526
+++ includes/common.inc	14 Mar 2006 06:01:04 -0000
@@ -1067,7 +1067,7 @@
     }
     return $result;
   }
-  elseif (function_exists($function)) {
+  else if (function_exists($function)) {
     $result = array();
     foreach($array as $value) {
       $result[$value] = $function($value);
Index: includes/database.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database.inc,v
retrieving revision 1.51
diff -u -r1.51 database.inc
--- includes/database.inc	8 Mar 2006 15:13:20 -0000	1.51
+++ includes/database.inc	14 Mar 2006 06:01:04 -0000
@@ -243,7 +243,7 @@
         $distinct = TRUE;
       }
     }
-    elseif (isset($result)) {
+    else if (isset($result)) {
       $where[] = $result;
     }
   }
@@ -287,15 +287,15 @@
       $replace = 'WHERE';
       $add = 'AND';
     }
-    elseif (strpos($query, 'GROUP')) {
+    else if (strpos($query, 'GROUP')) {
       $replace = 'GROUP';
       $add = 'GROUP';
     }
-    elseif (strpos($query, 'ORDER')) {
+    else if (strpos($query, 'ORDER')) {
       $replace = 'ORDER';
       $add = 'ORDER';
     }
-    elseif (strpos($query, 'LIMIT')) {
+    else if (strpos($query, 'LIMIT')) {
       $replace = 'LIMIT';
       $add = 'LIMIT';
     }
Index: includes/file.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/file.inc,v
retrieving revision 1.67
diff -u -r1.67 file.inc
--- includes/file.inc	10 Mar 2006 19:02:06 -0000	1.67
+++ includes/file.inc	14 Mar 2006 06:01:04 -0000
@@ -627,7 +627,7 @@
         if (is_dir("$dir/$file") && $recurse) {
           $files = array_merge($files, file_scan_directory("$dir/$file", $mask, $nomask, $callback, $recurse, $key, $min_depth, $depth + 1));
         }
-        elseif ($depth >= $min_depth && ereg($mask, $file)) {
+        else if ($depth >= $min_depth && ereg($mask, $file)) {
           $filename = "$dir/$file";
           $basename = basename($file);
           $name = substr($basename, 0, strrpos($basename, '.'));
Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.77
diff -u -r1.77 form.inc
--- includes/form.inc	12 Mar 2006 09:28:12 -0000	1.77
+++ includes/form.inc	14 Mar 2006 06:01:04 -0000
@@ -85,7 +85,7 @@
     if (function_exists($form_id .'_validate')) {
       $form['#validate'] = array($form_id .'_validate' => array());
     }
-    elseif (function_exists($callback .'_validate')) {
+    else if (function_exists($callback .'_validate')) {
       $form['#validate'] = array($callback .'_validate' => array());
     }
   }
@@ -96,7 +96,7 @@
       // $form_values because it will change later
       $form['#submit'] = array($form_id .'_submit' => array($form_id, &$form_values));
     }
-    elseif (function_exists($callback .'_submit')) {
+    else if (function_exists($callback .'_submit')) {
       $form['#submit'] = array($callback .'_submit' => array($form_id, &$form_values));
     }
   }
@@ -114,7 +114,7 @@
       if (isset($redirect)) {
         $goto = $redirect;
       }
-      elseif (isset($form['#redirect'])) {
+      else if (isset($form['#redirect'])) {
         $goto = $form['#redirect'];
       }
       if ($goto !== FALSE) {
@@ -131,7 +131,7 @@
   if (theme_get_function($form_id)) {
     $form['#theme'] = $form_id;
   }
-  elseif (theme_get_function($callback)) {
+  else if (theme_get_function($callback)) {
     $form['#theme'] = $callback;
   }
 
@@ -205,7 +205,7 @@
             }
           }
         }
-        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', t('Illegal choice %choice in %name element.', array('%choice' => theme_placeholder(check_plain($v)), '%name' => theme('placeholder', empty($elements['#title']) ? $elements['#parents'][0] : $elements['#title'])), WATCHDOG_ERROR));
         }
@@ -663,7 +663,7 @@
     }
     $form['#ref'] = $pass1;
   }
-  elseif ($form['#required'] && !empty($_POST['edit'])) {
+  else if ($form['#required'] && !empty($_POST['edit'])) {
     form_set_error('pass1', t('Password field is required.'));
   }
   return $form;
Index: includes/image.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/image.inc,v
retrieving revision 1.12
diff -u -r1.12 image.inc
--- includes/image.inc	14 Dec 2005 20:06:41 -0000	1.12
+++ includes/image.inc	14 Mar 2006 06:01:04 -0000
@@ -35,7 +35,7 @@
     if ($toolkit != 'gd' && file_exists($toolkit_file)) {
       include_once $toolkit_file;
     }
-    elseif (!image_gd_check_settings()) {
+    else if (!image_gd_check_settings()) {
       $toolkit = false;
     }
   }
Index: includes/locale.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/locale.inc,v
retrieving revision 1.67
diff -u -r1.67 locale.inc
--- includes/locale.inc	27 Feb 2006 13:22:29 -0000	1.67
+++ includes/locale.inc	14 Mar 2006 06:01:04 -0000
@@ -205,7 +205,7 @@
       if ($context == "COMMENT") { // Already in comment context: add
         $current["#"][] = substr($line, 1);
       }
-      elseif (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one
+      else if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one
         _locale_import_one_string($current, $lang);
         $current = array();
         $current["#"][] = substr($line, 1);
@@ -216,7 +216,7 @@
         return FALSE;
       }
     }
-    elseif (!strncmp("msgid_plural", $line, 12)) {
+    else if (!strncmp("msgid_plural", $line, 12)) {
       if ($context != "MSGID") { // Must be plural form for current entry
         drupal_set_message(t('The translation file %filename contains an error: "msgid_plural" was expected but not found on line %line.', array('%filename' => $message, '%line' => $lineno)), 'error');
         return FALSE;
@@ -230,12 +230,12 @@
       $current["msgid"] = $current["msgid"] ."\0". $quoted;
       $context = "MSGID_PLURAL";
     }
-    elseif (!strncmp("msgid", $line, 5)) {
+    else if (!strncmp("msgid", $line, 5)) {
       if ($context == "MSGSTR") {   // End current entry, start a new one
         _locale_import_one_string($current, $lang);
         $current = array();
       }
-      elseif ($context == "MSGID") { // Already in this context? Parse error
+      else if ($context == "MSGID") { // Already in this context? Parse error
         drupal_set_message(t('The translation file %filename contains an error: "msgid" is unexpected on line %line.', array('%filename' => $message, '%line' => $lineno)), 'error');
         return FALSE;
       }
@@ -248,7 +248,7 @@
       $current["msgid"] = $quoted;
       $context = "MSGID";
     }
-    elseif (!strncmp("msgstr[", $line, 7)) {
+    else if (!strncmp("msgstr[", $line, 7)) {
       if (($context != "MSGID") && ($context != "MSGID_PLURAL") && ($context != "MSGSTR_ARR")) { // Must come after msgid, msgid_plural, or msgstr[]
         drupal_set_message(t('The translation file %filename contains an error: "msgstr[]" is unexpected on line %line.', array('%filename' => $message, '%line' => $lineno)), 'error');
         return FALSE;
@@ -268,7 +268,7 @@
       $current["msgstr"][$plural] = $quoted;
       $context = "MSGSTR_ARR";
     }
-    elseif (!strncmp("msgstr", $line, 6)) {
+    else if (!strncmp("msgstr", $line, 6)) {
       if ($context != "MSGID") {   // Should come just after a msgid block
         drupal_set_message(t('The translation file %filename contains an error: "msgstr" is unexpected on line %line.', array('%filename' => $message, '%line' => $lineno)), 'error');
         return FALSE;
@@ -282,7 +282,7 @@
       $current["msgstr"] = $quoted;
       $context = "MSGSTR";
     }
-    elseif ($line != "") {
+    else if ($line != "") {
       $quoted = _locale_import_parse_quoted($line);
       if ($quoted === false) {
         drupal_set_message(t('The translation file %filename contains a syntax error on line %line.', array('%filename' => $message, '%line' => $lineno)), 'error');
@@ -291,10 +291,10 @@
       if (($context == "MSGID") || ($context == "MSGID_PLURAL")) {
         $current["msgid"] .= $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 {
@@ -308,7 +308,7 @@
   if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) {
     _locale_import_one_string($current, $lang);
   }
-  elseif ($context != "COMMENT") {
+  else if ($context != "COMMENT") {
     drupal_set_message(t('The translation file %filename ended unexpectedly at line %line.', array('%filename' => $message, '%line' => $lineno)), 'error');
     return FALSE;
   }
@@ -331,7 +331,7 @@
     return array($headerdone, $additions, $updates);
   }
   // Current string is the header information
-  elseif ($value['msgid'] == '') {
+  else if ($value['msgid'] == '') {
     $hdr = _locale_import_parse_header($value);
 
     // Get the plural formula
@@ -527,20 +527,20 @@
     if (is_numeric($token)) {
       $elstk[] = $ctok;
     }
-    elseif ($ctok == "n") {
+    else if ($ctok == "n") {
       $elstk[] = '$n';
     }
-    elseif ($ctok == "(") {
+    else if ($ctok == "(") {
       $opstk[] = $ctok;
     }
-    elseif ($ctok == ")") {
+    else if ($ctok == ")") {
       $topop = array_pop($opstk);
       while (($topop != NULL) && ($topop != "(")) {
         $elstk[] = $topop;
         $topop = array_pop($opstk);
       }
     }
-    elseif ($prec[$ctok]) {
+    else if ($prec[$ctok]) {
       // If it's an operator, then pop from $oparr into $elarr until the
       // precedence in $oparr is less than current, then push into $oparr
       $topop = array_pop($opstk);
@@ -576,7 +576,7 @@
         if ($op == ":") {
           $f = $elstk[$i - 2] ."):". $elstk[$i - 1] .")";
         }
-        elseif ($op == "?") {
+        else if ($op == "?") {
           $f = "(". $elstk[$i - 2] ."?(". $elstk[$i - 1];
         }
         else {
@@ -618,7 +618,7 @@
       $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:
@@ -714,7 +714,7 @@
   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 {
@@ -916,7 +916,7 @@
       $cur = $word;
       $nstr = 0;
     }
-    elseif (strlen("$cur $word") > $len) {
+    else if (strlen("$cur $word") > $len) {
       $ret[] = $cur . " ";
       $cur = $word;
     }
@@ -1175,7 +1175,7 @@
 function _locale_get_iso639_list() {
   return array(
     "aa" => array("Afar"),
-    "ab" => array("Abkhazian", "аҧсуа бызшәа"),
+    "ab" => array("Abkhazian", "аҧ�?уа бызшәа"),
     "ae" => array("Avestan"),
     "af" => array("Afrikaans"),
     "ak" => array("Akan"),
@@ -1186,8 +1186,8 @@
     "ay" => array("Aymara"),
     "az" => array("Azerbaijani", "azərbaycan"),
     "ba" => array("Bashkir"),
-    "be" => array("Belarusian", "Беларуская"),
-    "bg" => array("Bulgarian", "Български"),
+    "be" => array("Belarusian", "Белару�?ка�?"),
+    "bg" => array("Bulgarian", "Българ�?ки"),
     "bh" => array("Bihari"),
     "bi" => array("Bislama"),
     "bm" => array("Bambara", "Bamanankan"),
@@ -1208,14 +1208,14 @@
     "de" => array("German", "Deutsch"),
     "dv" => array("Maldivian"),
     "dz" => array("Bhutani"),
-    "ee" => array("Ewe", "Ɛʋɛ"),
+    "ee" => array("Ewe", "�?ʋɛ"),
     "el" => array("Greek", "Ελληνικά"),
     "en" => array("English"),
     "eo" => array("Esperanto"),
     "es" => array("Spanish", "Español"),
     "et" => array("Estonian", "Eesti"),
     "eu" => array("Basque", "Euskera"),
-    "fa" => array("Persian", "فارسی"),
+    "fa" => array("Persian", "�?ارسی"),
     "ff" => array("Fulah", "Fulfulde"),
     "fi" => array("Finnish", "Suomi"),
     "fj" => array("Fiji"),
@@ -1230,7 +1230,7 @@
     "gv" => array("Manx"),
     "ha" => array("Hausa"),
     "he" => array("Hebrew", "עברית"),
-    "hi" => array("Hindi", "हिन्दी"),
+    "hi" => array("Hindi", "हिन�?दी"),
     "ho" => array("Hiri Motu"),
     "hr" => array("Croatian", "Hrvatski"),
     "hu" => array("Hungarian", "Magyar"),
@@ -1241,7 +1241,7 @@
     "ie" => array("Interlingue"),
     "ig" => array("Igbo"),
     "ik" => array("Inupiak"),
-    "is" => array("Icelandic", "Íslenska"),
+    "is" => array("Icelandic", "�?slenska"),
     "it" => array("Italian", "Italiano"),
     "iu" => array("Inuktitut"),
     "ja" => array("Japanese", "日本語"),
@@ -1253,7 +1253,7 @@
     "kk" => array("Kazakh", "Қазақ"),
     "kl" => array("Greenlandic"),
     "km" => array("Cambodian"),
-    "kn" => array("Kannada", "ಕನ್ನಡ"),
+    "kn" => array("Kannada", "ಕನ�?ನಡ"),
     "ko" => array("Korean", "한국어"),
     "kr" => array("Kanuri"),
     "ks" => array("Kashmiri"),
@@ -1271,7 +1271,7 @@
     "mg" => array("Malagasy"),
     "mh" => array("Marshallese"),
     "mi" => array("Maori"),
-    "mk" => array("Macedonian", "Македонски"),
+    "mk" => array("Macedonian", "Македон�?ки"),
     "ml" => array("Malayalam", "മലയാളം"),
     "mn" => array("Mongolian"),
     "mo" => array("Moldavian"),
@@ -1301,7 +1301,7 @@
     "rm" => array("Rhaeto-Romance"),
     "rn" => array("Kirundi"),
     "ro" => array("Romanian", "Română"),
-    "ru" => array("Russian", "Русский"),
+    "ru" => array("Russian", "Ру�?�?кий"),
     "rw" => array("Kinyarwanda"),
     "sa" => array("Sanskrit"),
     "sc" => array("Sardinian"),
@@ -1310,20 +1310,20 @@
     "sg" => array("Sango"),
     "sh" => array("Serbo-Croatian"),
     "si" => array("Singhalese"),
-    "sk" => array("Slovak", "Slovenčina"),
-    "sl" => array("Slovenian", "Slovenščina"),
+    "sk" => array("Slovak", "Sloven�?ina"),
+    "sl" => array("Slovenian", "Slovenš�?ina"),
     "sm" => array("Samoan"),
     "sn" => array("Shona"),
     "so" => array("Somali"),
     "sq" => array("Albanian", "Shqip"),
-    "sr" => array("Serbian", "Српски"),
+    "sr" => array("Serbian", "Срп�?ки"),
     "ss" => array("Siswati"),
     "st" => array("Sesotho"),
     "su" => array("Sudanese"),
     "sv" => array("Swedish", "Svenska"),
     "sw" => array("Swahili", "Kiswahili"),
-    "ta" => array("Tamil", "தமிழ்"),
-    "te" => array("Telugu", "తెలుగు"),
+    "ta" => array("Tamil", "தமிழ�?"),
+    "te" => array("Telugu", "తెల�?గ�?"),
     "tg" => array("Tajik"),
     "th" => array("Thai", "ภาษาไทย"),
     "ti" => array("Tigrinya"),
@@ -1337,7 +1337,7 @@
     "tw" => array("Twi"),
     "ty" => array("Tahitian"),
     "ug" => array("Uighur"),
-    "uk" => array("Ukrainian", "Українська"),
+    "uk" => array("Ukrainian", "Україн�?ька"),
     "ur" => array("Urdu", "اردو"),
     "uz" => array("Uzbek", "o'zbek"),
     "ve" => array("Venda"),
@@ -1349,7 +1349,7 @@
     "yo" => array("Yoruba", "Yorùbá"),
     "za" => array("Zhuang"),
     "zh-hans" => array("Chinese, Simplified", "简体中文"),
-    "zh-hant" => array("Chinese, Traditional", "繁體中文"),
+    "zh-hant" => array("Chinese, Traditional", "�?體中文"),
     "zu" => array("Zulu", "isiZulu"),
   );
 }
Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.109
diff -u -r1.109 menu.inc
--- includes/menu.inc	13 Mar 2006 21:33:18 -0000	1.109
+++ includes/menu.inc	14 Mar 2006 06:01:04 -0000
@@ -989,10 +989,10 @@
   if ($a['weight'] < $b['weight']) {
     return -1;
   }
-  elseif ($a['weight'] > $b['weight']) {
+  else if ($a['weight'] > $b['weight']) {
     return 1;
   }
-  elseif (isset($a['title']) && isset($b['title'])) {
+  else if (isset($a['title']) && isset($b['title'])) {
     return strnatcasecmp($a['title'], $b['title']);
   }
   else {
Index: includes/path.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/path.inc,v
retrieving revision 1.3
diff -u -r1.3 path.inc
--- includes/path.inc	24 Jan 2006 08:18:26 -0000	1.3
+++ includes/path.inc	14 Mar 2006 06:01:04 -0000
@@ -49,7 +49,7 @@
   if ($action == 'wipe') {
     $map = array();
   }
-  elseif ($count > 0 && $path != '') {
+  else if ($count > 0 && $path != '') {
     if ($action == 'alias') {
       if (isset($map[$path])) {
         return $map[$path];
@@ -62,7 +62,7 @@
         $map[$path] = $path;
       }
     }
-    elseif ($action == 'source') {
+    else if ($action == 'source') {
       if ($alias = array_search($path, $map)) {
         return $alias;
       }
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.285
diff -u -r1.285 theme.inc
--- includes/theme.inc	13 Mar 2006 21:42:35 -0000	1.285
+++ includes/theme.inc	14 Mar 2006 06:01:04 -0000
@@ -73,7 +73,7 @@
    // file is a theme; include it
    include_once './' . $themes[$theme]->filename;
   }
-  elseif (strpos($themes[$theme]->description, '.engine')) {
+  else if (strpos($themes[$theme]->description, '.engine')) {
     // file is a template; include its engine
     include_once './' . $themes[$theme]->description;
     $theme_engine = basename($themes[$theme]->description, '.engine');
@@ -188,11 +188,11 @@
     // call theme function
     return $theme .'_'. $function;
   }
-  elseif (($theme != '') && isset($theme_engine) && function_exists($theme_engine .'_'. $function)) {
+  else if (($theme != '') && isset($theme_engine) && function_exists($theme_engine .'_'. $function)) {
     // call engine function
     return $theme_engine .'_'. $function;
   }
-  elseif (function_exists('theme_'. $function)){
+  else if (function_exists('theme_'. $function)){
     // call Drupal function
     return 'theme_'. $function;
   }
@@ -302,7 +302,7 @@
       if ($settings['default_logo']) {
         $settings['logo'] .= dirname($theme_object->filename) .'/logo.png';
       }
-      elseif ($settings['logo_path']) {
+      else if ($settings['logo_path']) {
         $settings['logo'] .= $settings['logo_path'];
       }
     }
@@ -317,7 +317,7 @@
           $settings['favicon'] .= 'misc/favicon.ico';
         }
       }
-      elseif ($settings['favicon_path']) {
+      else if ($settings['favicon_path']) {
         $settings['favicon'] .= $settings['favicon_path'];
       }
     }
Index: modules/aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator.module,v
retrieving revision 1.275
diff -u -r1.275 aggregator.module
--- modules/aggregator.module	8 Mar 2006 09:52:13 -0000	1.275
+++ modules/aggregator.module	14 Mar 2006 06:01:04 -0000
@@ -851,7 +851,7 @@
     if ($item['LINK']) {
       $link = $item['LINK'];
     }
-    elseif ($item['GUID'] && (strncmp($item['GUID'], 'http://', 7) == 0)) {
+    else if ($item['GUID'] && (strncmp($item['GUID'], 'http://', 7) == 0)) {
       $link = $item['GUID'];
     }
     else {
@@ -1077,7 +1077,7 @@
   if (!arg(1)) {
     $form['feed_icon'] = array('#value' => theme('feed_icon', url('aggregator/rss')));
   }
-  elseif (arg(1) == 'categories' && arg(2) && !arg(3)) {
+  else if (arg(1) == 'categories' && arg(2) && !arg(3)) {
     $form['feed_icon'] = array('#value' => theme('feed_icon', url('aggregator/rss/' . arg(2))));
   }
   $output .= $form['feed_icon']['#value'];
Index: modules/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment.module,v
retrieving revision 1.440
diff -u -r1.440 comment.module
--- modules/comment.module	6 Mar 2006 20:52:55 -0000	1.440
+++ modules/comment.module	14 Mar 2006 06:01:04 -0000
@@ -1209,7 +1209,7 @@
       if ($edit['author']) {
         $author = $edit['author'];
       }
-      elseif ($edit['name']) {
+      else if ($edit['name']) {
         $author = $edit['name'];
       }
       else {
@@ -1364,7 +1364,7 @@
   if ($edit['author']) {
     $account = user_load(array('name' => $edit['author']));
   }
-  elseif ($user->uid && !isset($edit['is_anonymous'])) {
+  else if ($user->uid && !isset($edit['is_anonymous'])) {
     $account = $user;
   }
   if ($account) {
Index: modules/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum.module,v
retrieving revision 1.318
diff -u -r1.318 forum.module
--- modules/forum.module	8 Mar 2006 22:11:54 -0000	1.318
+++ modules/forum.module	14 Mar 2006 06:01:04 -0000
@@ -81,7 +81,7 @@
       'access' => user_access('administer forums'),
       'type' => MENU_LOCAL_TASK);
   }
-  elseif (is_numeric(arg(4))) {
+  else if (is_numeric(arg(4))) {
     $term = taxonomy_get_term(arg(4));
     // Check if this is a valid term.
     if ($term) {
@@ -155,7 +155,7 @@
       node_delete($node->nid);
     }
   }
-  elseif ($op == 'delete' && $type == 'vocabulary' && $object->vid == _forum_get_vid())  {
+  else if ($op == 'delete' && $type == 'vocabulary' && $object->vid == _forum_get_vid())  {
     variable_del('forum_nav_vocabulary');
   }
 }
Index: modules/menu.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu.module,v
retrieving revision 1.68
diff -u -r1.68 menu.module
--- modules/menu.module	12 Mar 2006 16:21:40 -0000	1.68
+++ modules/menu.module	14 Mar 2006 06:01:04 -0000
@@ -188,7 +188,7 @@
           menu_node_form_delete($node);
           menu_rebuild();
         }
-        elseif ($node->menu['title']) {
+        else if ($node->menu['title']) {
           $node->menu['path'] = ($node->menu['path']) ? $node->menu['path'] : "node/$node->nid";
           menu_edit_item_save($node->menu);
           menu_rebuild();
@@ -434,7 +434,7 @@
   if ($status == SAVED_UPDATED) {
     drupal_set_message(t('The menu item %title has been updated.', array('%title' => theme('placeholder', $edit['title']))));
   }
-  elseif ($status == SAVED_NEW) {
+  else if ($status == SAVED_NEW) {
     drupal_set_message(t('The menu item %title has been created.', array('%title' => theme('placeholder', $edit['title']))));
   }
   return $edit['mid'];
@@ -493,7 +493,7 @@
   if ($item['mid']) {
     db_query('DELETE FROM {menu} WHERE mid = %d', $item['mid']);
   }
-  elseif ($item['path']) {
+  else if ($item['path']) {
     db_query("DELETE FROM {menu} WHERE path = '%s'", $item['path']);
   }
 }
Index: modules/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node.module,v
retrieving revision 1.615
diff -u -r1.615 node.module
--- modules/node.module	9 Mar 2006 22:38:40 -0000	1.615
+++ modules/node.module	14 Mar 2006 06:01:04 -0000
@@ -139,7 +139,7 @@
   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;
@@ -209,10 +209,10 @@
     if (is_array($node)) {
       $type = $node['type'];
     }
-    elseif (is_object($node)) {
+    else if (is_object($node)) {
       $type = $node->type;
     }
-    elseif (is_string($node)) {
+    else if (is_string($node)) {
       $type = $node;
     }
     if (!isset($node_names[$type])) {
Index: modules/profile.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile.module,v
retrieving revision 1.140
diff -u -r1.140 profile.module
--- modules/profile.module	12 Mar 2006 14:08:55 -0000	1.140
+++ modules/profile.module	14 Mar 2006 06:01:04 -0000
@@ -584,10 +584,10 @@
   if ($_GET['q'] == 'user/register') {
     $result = db_query('SELECT * FROM {profile_fields} WHERE visibility != %d AND register = 1 ORDER BY category, weight', PROFILE_HIDDEN);
   }
-  elseif ($_GET['q'] == 'admin/user/create') {
+  else if ($_GET['q'] == 'admin/user/create') {
     $result = db_query('SELECT * FROM {profile_fields} WHERE register = 1 ORDER BY category, weight');
   }
-  elseif (user_access('administer users')) {
+  else if (user_access('administer users')) {
     $result = db_query("SELECT * FROM {profile_fields} WHERE LOWER(category) = LOWER('%s') ORDER BY weight", $category);
   }
   else {
@@ -680,10 +680,10 @@
   if ($_GET['q'] == 'user/register') {
     $result = db_query('SELECT * FROM {profile_fields} WHERE visibility != %d AND register = 1 ORDER BY category, weight', PROFILE_HIDDEN);
   }
-  elseif ($_GET['q'] == 'admin/user/create') {
+  else if ($_GET['q'] == 'admin/user/create') {
     $result = db_query('SELECT * FROM {profile_fields} WHERE register = 1 ORDER BY category, weight');
   }
-  elseif (user_access('administer users')) {
+  else if (user_access('administer users')) {
     $result = db_query("SELECT * FROM {profile_fields} WHERE LOWER(category) = LOWER('%s') ORDER BY weight", $category);
   }
   else {
Index: modules/search.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/search.module,v
retrieving revision 1.166
diff -u -r1.166 search.module
--- modules/search.module	3 Mar 2006 08:37:47 -0000	1.166
+++ modules/search.module	14 Mar 2006 06:01:04 -0000
@@ -664,7 +664,7 @@
     }
     // OR operator: instead of a single keyword, we store an array of all
     // OR'd keywords.
-    elseif ($match[2] == 'OR' && count($keys['positive'])) {
+    else if ($match[2] == 'OR' && count($keys['positive'])) {
       $last = array_pop($keys['positive']);
       // Starting a new OR?
       if (!is_array($last)) {
Index: modules/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy.module,v
retrieving revision 1.265
diff -u -r1.265 taxonomy.module
--- modules/taxonomy.module	11 Mar 2006 13:47:51 -0000	1.265
+++ modules/taxonomy.module	14 Mar 2006 06:01:04 -0000
@@ -359,7 +359,7 @@
     if ($vocabulary->hierarchy == 1) {
       $form['parent'] = _taxonomy_term_select(t('Parent'), 'parent', $parent, $vocabulary_id, l(t('Parent term'), 'admin/help/taxonomy', NULL, NULL, 'parent') .'.', 0, '<'. t('root') .'>', $exclude);
     }
-    elseif ($vocabulary->hierarchy == 2) {
+    else if ($vocabulary->hierarchy == 2) {
       $form['parent'] = _taxonomy_term_select(t('Parents'), 'parent', $parent, $vocabulary_id, l(t('Parent terms'), 'admin/help/taxonomy', NULL, NULL, 'parent') .'.', 1, '<'. t('root') .'>', $exclude);
     }
   }
@@ -1237,7 +1237,7 @@
   if ($_POST['op'] == t('Delete') || $_POST['edit']['confirm']) {
     return _taxonomy_confirm_del_vocabulary($vid);
   }
-  elseif ($vid) {
+  else if ($vid) {
     $vocabulary = (array)taxonomy_get_vocabulary($vid);
   }
   return taxonomy_form_vocabulary($vocabulary);
@@ -1250,7 +1250,7 @@
   if ($_POST['op'] == t('Delete') || $_POST['edit']['confirm']) {
     return _taxonomy_confirm_del_term($tid);
   }
-  elseif ($tid) {
+  else if ($tid) {
     $term = (array)taxonomy_get_term($tid);
   }
   return taxonomy_form_term($term);
Index: modules/throttle.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/throttle.module,v
retrieving revision 1.59
diff -u -r1.59 throttle.module
--- modules/throttle.module	21 Feb 2006 18:46:54 -0000	1.59
+++ modules/throttle.module	14 Mar 2006 06:01:04 -0000
@@ -67,7 +67,7 @@
                                  '%count users accessing site; throttle enabled.');
       }
     }
-    elseif ($max_guests && $guests > $max_guests) {
+    else if ($max_guests && $guests > $max_guests) {
       if (!$throttle) {
         variable_set('throttle_level', 1);
         $message = format_plural($guests,
Index: modules/upload.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload.module,v
retrieving revision 1.80
diff -u -r1.80 upload.module
--- modules/upload.module	13 Mar 2006 22:23:09 -0000	1.80
+++ modules/upload.module	14 Mar 2006 06:01:04 -0000
@@ -285,10 +285,10 @@
           if ($error['extension'] == count($user->roles) && $user->uid != 1) {
             form_set_error('upload', t('The selected file %name can not be attached to this post, because it is only possible to attach files with the following extensions: %files-allowed.', array('%name' => theme('placeholder', $file->filename), '%files-allowed' => theme('placeholder', $extensions))));
           }
-          elseif ($error['uploadsize'] == count($user->roles) && $user->uid != 1) {
+          else if ($error['uploadsize'] == count($user->roles) && $user->uid != 1) {
             form_set_error('upload', t('The selected file %name can not be attached to this post, because it exceeded the maximum filesize of %maxsize.', array('%name' => theme('placeholder', $file->filename), '%maxsize' => theme('placeholder', format_size($uploadsize)))));
           }
-          elseif ($error['usersize'] == count($user->roles) && $user->uid != 1) {
+          else if ($error['usersize'] == count($user->roles) && $user->uid != 1) {
             form_set_error('upload', t('The selected file %name can not be attached to this post, because the disk quota of %quota has been reached.', array('%name' => theme('placeholder', $file->filename), '%quota' => theme('placeholder', format_size($usersize)))));
           }
         }
@@ -452,7 +452,7 @@
     }
 
     // New file upload
-    elseif (strpos($file->fid, 'upload') !== false) {
+    else if (strpos($file->fid, 'upload') !== false) {
       if ($file = file_save_upload($file, $file->filename)) {
         // Track the file which was submitted last, in case of a direct submission
         // without preview or attach. See notes in upload_prepare.
@@ -468,7 +468,7 @@
     }
 
     // Create a new revision, as needed
-    elseif ($node->old_vid && is_numeric($fid)) {
+    else if ($node->old_vid && is_numeric($fid)) {
       db_query("INSERT INTO {file_revisions} (fid, vid, list, description) VALUES (%d, %d, %d, '%s')", $file->fid, $node->vid, $file->list, $file->description);
     }
 
Index: themes/engines/phptemplate/phptemplate.engine
===================================================================
RCS file: /cvs/drupal/drupal/themes/engines/phptemplate/phptemplate.engine,v
retrieving revision 1.30
diff -u -r1.30 phptemplate.engine
--- themes/engines/phptemplate/phptemplate.engine	13 Mar 2006 21:42:35 -0000	1.30
+++ themes/engines/phptemplate/phptemplate.engine	14 Mar 2006 06:01:04 -0000
@@ -67,7 +67,7 @@
   if (function_exists('_phptemplate_' . $hook)) {
     return call_user_func('_phptemplate_' . $hook, $variables, $file);
   }
-  elseif (function_exists('_phptemplate_default')) {
+  else if (function_exists('_phptemplate_default')) {
     return call_user_func('_phptemplate_default', $hook, $variables, $file);
   }
 
@@ -96,7 +96,7 @@
     $variables['block_zebra'] = ($count['block_counter'][$sidebar_indicator] % 2) ? 'odd' : 'even';
     $variables['block_id'] = $count['block_counter'][$sidebar_indicator]++;
   }
-  elseif ($hook == 'page') {
+  else if ($hook == 'page') {
     $regions = system_region_list($theme);
     // Load all region content assigned via blocks.
     foreach (array_keys($regions) as $region) {