=== added file 'includes/install.mysql.inc'
--- /dev/null	
+++ includes/install.mysql.inc	
@@ -0,0 +1,140 @@
+<?php
+
+// MySQL specific install functions
+
+/**
+ * Check if MySQL is available.
+ *
+ * @return
+ *  TRUE/FALSE
+ */
+function mysql_is_available() {
+  return function_exists('mysql_connect');
+}
+
+/**
+ * Check if we can connect to MySQL.
+ *
+ * @return
+ *  TRUE/FALSE
+ */
+function drupal_test_mysql($url, &$success) {
+  if (!mysql_is_available()) {
+    drupal_set_message('PHP MySQL support not enabled.', 'error');
+    return FALSE;
+  }
+
+  $url = parse_url($url);
+
+  // Decode url-encoded information in the db connection string.
+  $url['user'] = urldecode($url['user']);
+  $url['pass'] = urldecode($url['pass']);
+  $url['host'] = urldecode($url['host']);
+  $url['path'] = urldecode($url['path']);
+
+  // Allow for non-standard MySQL port.
+  if (isset($url['port'])) {
+     $url['host'] = $url['host'] .':'. $url['port'];
+  }
+
+  // Test connecting to the database.
+  $connection = @mysql_connect($url['host'], $url['user'], $url['pass'], TRUE, 2);
+  if (!$connection) {
+    drupal_set_message(st('Failure to connect to your MySQL database server. MySQL reports the following message: %error.<ul><li>Are you sure you have the correct username and password?</li><li>Are you sure that you have typed the correct database hostname?</li><li>Are you sure that the database server is running?</li></ul>For more help, see the <a href="http://drupal.org/node/258">Installation and upgrading handbook</a>. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => mysql_error())), 'error');    
+    return FALSE;
+  }
+
+  // Test selecting the database.
+  if (!mysql_select_db(substr($url['path'], 1))) {
+    drupal_set_message(st('We were able to connect to the MySQL database server (which means your username and password are valid) but not able to select your database. MySQL reports the following message: %error.<ul><li>Are you sure you have the correct database name?</li><li>Are you sure the database exists?</li><li>Are you sure the username has permission to access the database?</li></ul>For more help, see the <a href="http://drupal.org/node/258">Installation and upgrading handbook</a>. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => mysql_error())), 'error');
+    return FALSE;
+  }
+
+  $success = array('CONNECT');
+
+  // Test CREATE.
+  $query = 'CREATE TABLE drupal_install_test (id int(1) NULL)';
+  $result = mysql_query($query);
+  if ($error = mysql_error()) {
+    drupal_set_message(st('We were unable to create a test table on your MySQL database server with the command %query. MySQL reports the following message: %error.<ul><li>Are you sure the configured username has the necessary MySQL permissions to create tables in the database?</li></ul>For more help, see the <a href="http://drupal.org/node/258">Installation and upgrading handbook</a>. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%query' => $query, '%error' => $error)), 'error');
+    return FALSE;
+  }
+  $err = FALSE;
+  $success[] = 'SELECT';
+  $success[] = 'CREATE';
+
+  // Test INSERT.
+  $query = 'INSERT INTO drupal_install_test (id) VALUES (1)';
+  $result = mysql_query($query);
+  if ($error = mysql_error()) {
+    drupal_set_message(st('We were unable to insert a value into a test table on your MySQL database server. We tried inserting a value with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error');
+    $err = TRUE;
+  }
+  else {
+    $success[] = 'INSERT';
+  }
+
+  // Test UPDATE.
+  $query = 'UPDATE drupal_install_test SET id = 2';
+  $result = mysql_query($query);
+  if ($error = mysql_error()) {
+    drupal_set_message(st('We were unable to update a value in a test table on your MySQL database server. We tried updating a value with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error');
+    $err = TRUE;
+  }
+  else {
+    $success[] = 'UPDATE';
+  }
+
+  // Test LOCK.
+  $query = 'LOCK TABLES drupal_install_test WRITE';
+  $result = mysql_query($query);
+  if ($error = mysql_error()) {
+    drupal_set_message(st('We were unable to lock a test table on your MySQL database server. We tried locking a table with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error');
+    $err = TRUE;
+  }
+  else {
+    $success[] = 'LOCK';
+  }
+
+  // Test UNLOCK.
+  $query = 'UNLOCK TABLES';
+  $result = mysql_query($query);
+  if ($error = mysql_error()) {
+    drupal_set_message(st('We were unable to unlock a test table on your MySQL database server. We tried unlocking a table with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error');
+    $err = TRUE;
+  }
+  else {
+    $success[] = 'UNLOCK';
+  }
+
+  // Test DELETE.
+  $query = 'DELETE FROM drupal_install_test';
+  $result = mysql_query($query);
+  if ($error = mysql_error()) {
+    drupal_set_message(st('We were unable to delete a value from a test table on your MySQL database server. We tried deleting a value with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error');
+    $err = TRUE;
+  }
+  else {
+    $success[] = 'DELETE';
+  }
+
+  // Test DROP.
+  $query = 'DROP TABLE drupal_install_test';
+  $result = mysql_query($query);
+  if ($error = mysql_error()) {
+    drupal_set_message(st('We were unable to drop a test table from your MySQL database server. We tried dropping a table with the command %query and MySQL reported the following error %error.', array('%query' => $query, '%error' => $error)), 'error');
+    $err = TRUE;
+  }
+  else {
+    $success[] = 'DROP';
+  }
+
+  if ($err) {
+    return FALSE;
+  }
+
+  mysql_close($connection);
+  return TRUE;
+}
+
+?>
=== added file 'includes/install.mysqli.inc'
--- /dev/null	
+++ includes/install.mysqli.inc	
@@ -0,0 +1,140 @@
+<?php
+
+// MySQLi specific install functions
+
+/**
+ * Check if MySQLi is available.
+ *
+ * @return
+ *  TRUE/FALSE
+ */
+function mysqli_is_available() {
+  return function_exists('mysqli_connect');
+}
+
+/**
+ * Check if we can connect to MySQL.
+ *
+ * @return
+ *  TRUE/FALSE
+ */
+function drupal_test_mysqli($url, &$success) {
+  if (!mysqli_is_available()) {
+    drupal_set_message('PHP MySQLi support not enabled.', 'error');
+    return FALSE;
+  }
+
+  $url = parse_url($url);
+
+  // Decode url-encoded information in the db connection string.
+  $url['user'] = urldecode($url['user']);
+  $url['pass'] = urldecode($url['pass']);
+  $url['host'] = urldecode($url['host']);
+  $url['path'] = urldecode($url['path']);
+
+  // Allow for non-standard MySQL port.
+  if (isset($url['port'])) {
+     $url['host'] = $url['host'] .':'. $url['port'];
+  }
+
+  $connection = mysqli_init();
+  @mysqli_real_connect($connection, $url['host'], $url['user'], $url['pass'], substr($url['path'], 1), $url['port'], NULL, MYSQLI_CLIENT_FOUND_ROWS);
+  if (mysqli_connect_errno() >= 2000 || mysqli_connect_errno() == 1045) {
+    drupal_set_message(st('Failure to connect to your MySQL database server. MySQL reports the following message: %error.<ul><li>Are you sure you have the correct username and password?</li><li>Are you sure that you have typed the correct database hostname?</li><li>Are you sure that the database server is running?</li></ul>For more help, see the <a href="http://drupal.org/node/258">Installation and upgrading handbook</a>. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => mysqli_errno())), 'error');
+    return FALSE;
+  }
+
+  // Test selecting the database.
+  if (mysqli_connect_errno() > 0) {
+    drupal_set_message(st('We were able to connect to the MySQL database server (which means your username and password are valid) but not able to select your database. MySQL reports the following message: %error.<ul><li>Are you sure you have the correct database name?</li><li>Are you sure the database exists?</li><li>Are you sure the username has permission to access the database?</li></ul>For more help, see the <a href="http://drupal.org/node/258">Installation and upgrading handbook</a>. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => mysqli_error())), 'error');
+    return FALSE;
+  }
+
+  $success = array('CONNECT');
+
+  // Test CREATE.
+  $query = 'CREATE TABLE drupal_install_test (id int(1) NULL)';
+  $result = mysqli_query($query);
+  if ($error = mysqli_error()) {
+    drupal_set_message(st('We were unable to create a test table on your MySQL database server with the command %query. MySQL reports the following message: %error.<ul><li>Are you sure the configured username has the necessary MySQL permissions to create tables in the database?</li></ul>For more help, see the <a href="http://drupal.org/node/258">Installation and upgrading handbook</a>. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%query' => $query, '%error' => $error)), 'error');
+    return FALSE;
+  }
+  $err = FALSE;
+  $success[] = 'SELECT';
+  $success[] = 'CREATE';
+
+  // Test INSERT.
+  $query = 'INSERT INTO drupal_install_test (id) VALUES (1)';
+  $result = mysqli_query($query);
+  if ($error = mysqli_error()) {
+    drupal_set_message(st('We were unable to insert a value into a test table on your MySQL database server. We tried inserting a value with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error');
+    $err = TRUE;
+  }
+  else {
+    $success[] = 'INSERT';
+  }
+
+  // Test UPDATE.
+  $query = 'UPDATE drupal_install_test SET id = 2';
+  $result = mysqli_query($query);
+  if ($error = mysqli_error()) {
+    drupal_set_message(st('We were unable to update a value in a test table on your MySQL database server. We tried updating a value with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error');
+    $err = TRUE;
+  }
+  else {
+    $success[] = 'UPDATE';
+  }
+
+  // Test LOCK.
+  $query = 'LOCK TABLES drupal_install_test WRITE';
+  $result = mysqli_query($query);
+  if ($error = mysqli_error()) {
+    drupal_set_message(st('We were unable to lock a test table on your MySQL database server. We tried locking a table with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error');
+    $err = TRUE;
+  }
+  else {
+    $success[] = 'LOCK';
+  }
+
+  // Test UNLOCK.
+  $query = 'UNLOCK TABLES';
+  $result = mysqli_query($query);
+  if ($error = mysqli_error()) {
+    drupal_set_message(st('We were unable to unlock a test table on your MySQL database server. We tried unlocking a table with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error');
+    $err = TRUE;
+  }
+  else {
+    $success[] = 'UNLOCK';
+  }
+
+  // Test DELETE.
+  $query = 'DELETE FROM drupal_install_test';
+  $result = mysqli_query($query);
+  if ($error = mysqli_error()) {
+    drupal_set_message(st('We were unable to delete a value from a test table on your MySQL database server. We tried deleting a value with the command %query and MySQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error');
+    $err = TRUE;
+  }
+  else {
+    $success[] = 'DELETE';
+  }
+
+  // Test DROP.
+  $query = 'DROP TABLE drupal_install_test';
+  $result = mysqli_query($query);
+  if ($error = mysqli_error()) {
+    drupal_set_message(st('We were unable to drop a test table from your MySQL database server. We tried dropping a table with the command %query and MySQL reported the following error %error.', array('%query' => $query, '%error' => $error)), 'error');
+    $err = TRUE;
+  }
+  else {
+    $success[] = 'DROP';
+  }
+
+  if ($err) {
+    return FALSE;
+  }
+
+  mysqli_close($connection);
+  return TRUE;
+}
+
+?>
=== added file 'install.php'
--- /dev/null	
+++ install.php	
@@ -0,0 +1,417 @@
+<?php
+// $Id$
+
+$install = TRUE;
+require_once './includes/install.inc';
+
+/**
+ * The Drupal installation happens in a series of steps. We begin by verifying
+ * that the current environment meets our minimum requirements. We then go
+ * on to verify that settings.php is properly configured. From there we
+ * connect to the configured database and verify that it meets our minimum
+ * requirements. Finally we can allow the user to select an installation
+ * profile and complete the installation process.
+ *
+ * @param $phase
+ *   The installation phase we should proceed to.
+ */
+function install_main() {
+  global $profile;
+  require_once './includes/bootstrap.inc';
+  drupal_bootstrap(DRUPAL_BOOTSTRAP_CONFIGURATION);
+  require_once './modules/system/system.install';
+
+  // Check existing settings.php.
+  $verify = install_verify_settings();
+
+  // Drupal may already be installed.
+  if ($verify) {
+    // Establish a connection to the database.
+    require_once './includes/database.inc';
+    db_set_active();
+
+    // Check if Drupal is installed.
+    if (install_verify_drupal()) {
+      install_already_done_error();
+    }
+  }
+
+  // Load module basics (needed for hook invokes).
+  include_once './includes/module.inc';
+  $module_list['system']['filename'] = 'modules/system/system.module';
+  $module_list['filter']['filename'] = 'modules/filter/filter.module';
+  module_list(TRUE, FALSE, FALSE, $module_list);
+  drupal_load('module', 'system');
+  drupal_load('module', 'filter');
+
+  // Decide which profile to use.
+  if (!empty($_GET['profile'])) {
+    $profile = preg_replace('/[^a-zA-Z_0-9]/', '', $_GET['profile']);
+  }
+  elseif ($profile = install_select_profile()) {
+    _install_goto("install.php?profile=$profile");
+  }
+  else {
+    _install_no_profile_error();
+  }
+  // Load the profile.
+  require_once "./profiles/$profile.profile";
+
+  // Change the settings.php information if verification failed earlier.
+  if (!$verify) {
+    install_change_settings();
+  }
+
+  // Perform actual installation defined in the profile.
+  drupal_install_profile($profile);
+
+  // Warn about settings.php permissions risk
+  $settings_file = './'. conf_path() .'/settings.php';
+  if (!drupal_verify_install_file($settings_file, FILE_EXIST|FILE_READABLE|FILE_NOT_WRITABLE)) {
+    drupal_set_message(st('All necessary changes to %file have been made, so you should now remove write permissions to this file. Failure to remove write permissions to this file is a security risk.', array('%file' => $settings_file)), 'error');
+  }
+
+  // Show end page.
+  install_complete($profile);
+}
+
+/**
+ * Verify if Drupal is installed.
+ */
+function install_verify_drupal() {
+  $result = @db_query("SELECT name FROM {system} WHERE name = 'system'");
+  return $result && db_result($result) == 'system';
+}
+
+/**
+ * Verify existing settings.php
+ */
+function install_verify_settings() {
+  global $db_prefix, $db_type, $db_url;
+
+  // Verify existing settings (if any).
+  if ($_SERVER['REQUEST_METHOD'] == 'GET' && $db_url != 'mysql://username:password@localhost/databasename') {
+    // We need this because we want to run form_get_errors.
+    include_once './includes/form.inc';
+
+    $url = parse_url($db_url);
+    $db_user = urldecode($url['user']);
+    $db_pass = urldecode($url['pass']);
+    $db_host = urldecode($url['host']);
+    $db_path = ltrim(urldecode($url['path']), '/');
+    $settings_file = './'. conf_path() .'/settings.php';
+
+    _install_settings_validate($db_prefix, $db_type, $db_user, $db_pass, $db_host, $db_path, $settings_file);
+    if (!form_get_errors()) {
+      return TRUE;
+    }
+  }
+  return FALSE;
+}
+
+/**
+ * Configure and rewrite settings.php.
+ */
+function install_change_settings() {
+  global $profile, $db_url, $db_type, $db_prefix;
+
+  $url = parse_url($db_url);
+  $db_user = urldecode($url['user']);
+  $db_pass = urldecode($url['pass']);
+  $db_host = urldecode($url['host']);
+  $db_path = ltrim(urldecode($url['path']), '/');
+  $settings_file = './'. conf_path() .'/settings.php';
+
+  // We always need this because we want to run form_get_errors.
+  include_once './includes/form.inc';
+
+  // The existing database settings are not working, so we need write access
+  // to settings.php to change them.
+  if (!drupal_verify_install_file($settings_file, FILE_EXIST|FILE_READABLE|FILE_WRITABLE)) {
+    drupal_maintenance_theme();
+    drupal_set_message(st('The Drupal installer requires write permissions to %file during the installation process.', array('%file' => $settings_file)), 'error');
+
+    drupal_set_title('Drupal Installation');
+    print theme('install_page', '');
+    exit;
+  }
+
+  // Don't fill in placeholders
+  if ($db_url == 'mysql://username:password@localhost/databasename') {
+    $db_user = $db_pass = $db_path = '';
+  }
+
+  // Database type
+  $form['db_type'] = array(
+    '#type' => 'select',
+    '#title' => 'Database type',
+    '#required' => TRUE,
+    '#options' => drupal_detect_database_types(),
+    '#default_value' => $db_type,
+    '#description' => st('Select the type of database you would like to use with your %drupal installation. If you do not find your preferred database type listed here, verify that the database type is <a href="http://drupal.org/node/270#database">supported by Drupal</a> then confirm that it is properly installed and accessible from PHP. Only properly installed databases that are accessible from PHP and recognized by %drupal are displayed in this menu.', array('%drupal' => drupal_install_profile_name())),
+  );
+  // Database username
+  $form['db_user'] = array(
+    '#type' => 'textfield',
+    '#title' => 'Database username',
+    '#default_value' => $db_user,
+    '#size' => 45,
+    '#maxlength' => 45,
+    '#required' => TRUE,
+    '#description' => st('The database username that your %drupal installation will use to connect to your database server.', array('%drupal' => drupal_install_profile_name())),
+  );
+
+  // Database username
+  $form['db_pass'] = array(
+    '#type' => 'textfield',
+    '#title' => 'Database password',
+    '#default_value' => $db_pass,
+    '#size' => 45,
+    '#maxlength' => 45,
+    '#required' => TRUE,
+    '#description' => st('The database password that your %drupal installation will use to connect to your database server.', array('%drupal' => drupal_install_profile_name())),
+  );
+
+  // Database name
+  $form['db_path'] = array(
+    '#type' => 'textfield',
+    '#title' => 'Database name',
+    '#default_value' => $db_path,
+    '#size' => 45,
+    '#maxlength' => 45,
+    '#required' => TRUE,
+    '#description' => st('The name of the database where %drupal can install its database tables.', array('%drupal' => drupal_install_profile_name())),
+  );
+
+  // Database host
+  $form['db_host'] = array(
+    '#type' => 'textfield',
+    '#title' => 'Database host',
+    '#default_value' => $db_host,
+    '#size' => 45,
+    '#maxlength' => 45,
+    '#required' => TRUE,
+    '#description' => st('The hostname or IP address of your database server. If your database server is on the same machine as you are installing %drupal, you should probably enter "localhost".', array('%drupal' => drupal_install_profile_name())),
+  );
+
+  // Database prefix
+  $form['db_prefix'] = array(
+    '#type' => 'textfield',
+    '#title' => 'Database prefix',
+    '#default_value' => $db_prefix,
+    '#size' => 45,
+    '#maxlength' => 45,
+    '#required' => FALSE,
+    '#description' => 'Optionally set a prefix for all database table names. If a prefix is specified, all table names will be prepended with this value. Only alphanumeric characters and the underscore are allowed. If you do not wish to use a prefix, leave this field empty. If you wish to only prefix specific tables, you will need to manually edit your <em>settings.php</em> configuration file.',
+  );
+
+  $form['save'] = array(
+    '#type' => 'submit',
+    '#value' => 'Save configuration',
+  );
+  $form['errors'] = array();
+  $form['settings_file'] = array('#type' => 'value', '#value' => $settings_file);
+  $form['_db_url'] = array('#type' => 'value');
+  $form['#action'] = "install.php?profile=$profile";
+  $form['#redirect'] = NULL;
+  drupal_maintenance_theme();
+  $output = drupal_get_form('install_settings', $form);
+  drupal_set_title('Database configuration');
+  print theme('install_page', st('<p>Please fill out the following information to configure your %drupal site.</p>', array('%drupal' => drupal_install_profile_name())). $output);
+  exit;
+}
+
+/**
+ * Form API validate for install_settings form.
+ */
+function install_settings_validate($form_id, $form_values, $form) {
+  global $db_url;
+  _install_settings_validate($form_values['db_prefix'], $form_values['db_type'], $form_values['db_user'], $form_values['db_pass'], $form_values['db_host'], $form_values['db_path'], $form_values['settings_file'], $form);
+}
+
+/**
+ * Helper function for install_settings_validate.
+ */
+function _install_settings_validate($db_prefix, $db_type, $db_user, $db_pass, $db_host, $db_path, $settings_file, $form = NULL) {
+  global $db_url;
+
+  // Check for default username/password
+  if ($db_user == 'username' && $db_pass == 'password') {
+    form_set_error('db_user', st('You have configured %drupal to use the default username and password. This is not allowed for security reasons.', array('%drupal' => drupal_install_profile_name())));
+  }
+
+  // Verify database prefix
+  if (!empty($db_prefix) && preg_match('/[^A-Za-z0-9_]/', $db_prefix)) {
+    form_set_error('db_prefix', st('The database prefix you have entered, %db_prefix, is invalid. The database prefix can only contain alphanumeric characters and underscores.', array('%db_prefix' => $db_prefix)), 'error');
+  }
+
+  // Check database type
+  if (!isset($form)) {
+    $db_type = substr($db_url, 0, strpos($db_url, '://'));
+  }
+  $databases = drupal_detect_database_types();
+  if (!in_array($db_type, $databases)) {
+    form_set_error('db_type', st("In your %settings_file file you have configured Drupal to use a %db_type server, however your PHP installation currently does not support this database type.", array('%settings_file' => $settings_file, '%db_type' => $db_type)));
+  }
+  else {
+    // Verify
+    $db_url = $db_type .'://'. urlencode($db_user) .($db_pass ? ':'. urlencode($db_pass) : '') .'@'. ($db_host ? urlencode($db_host) : 'localhost') .'/'. urlencode($db_path);
+    if (isset($form)) {
+      form_set_value($form['_db_url'], $db_url);
+    }
+    $success = array();
+
+    $function = 'drupal_test_'. $db_type;
+    if (!$function($db_url, $success)) {
+      if (isset($success['CONNECT'])) {
+        form_set_error('db_type', st('In order for Drupal to work and to proceed with the installation process you must resolve all permission issues reported above. We were able to verify that we have permission for the following commands: %commands. For more help with configuring your database server, see the <a href="http://drupal.org/node/258">Installation and upgrading handbook</a>. If you are unsure what any of this means you should probably contact your hosting provider.', array('%commands' => implode($success, ', '))));
+      }
+      else {
+        form_set_error('db_type', '');
+      }
+    }
+  }
+}
+
+/**
+ * Form API submit for install_settings form.
+ */
+function install_settings_submit($form_id, $form_values) {
+  global $profile;
+
+  // Update global settings array and save
+  $settings['db_url'] = array(
+    'value'    => $form_values['_db_url'],
+    'required' => TRUE,
+  );
+  $settings['db_prefix'] = array(
+    'value'    => $form_values['db_prefix'],
+    'required' => TRUE,
+  );
+  drupal_rewrite_settings($settings);
+
+  // Continue to install profile step
+  _install_goto("install.php?profile=$profile");
+}
+
+/**
+ * Find all .profile files and allow admin to select which to install.
+ *
+ * @return
+ *   The selected profile.
+ */
+function install_select_profile() {
+  include_once './includes/file.inc';
+  include_once './includes/form.inc';
+
+  $profiles = file_scan_directory('./profiles', '\.profile$', array('.', '..', 'CVS'), 0, TRUE, 'name', 0);
+  // Don't need to choose profile if only one available.
+  if (sizeof($profiles) == 1) {
+    $profile = array_pop($profiles);
+    require_once $profile->filename;
+    return $profile->name;
+  }
+  elseif (sizeof($profiles) > 1) {
+    drupal_maintenance_theme();
+    $form = '';
+    foreach ($profiles as $profile) {
+      include_once($profile->filename);
+      if ($_POST['edit']['profile'] == $profile->name) {
+        return $profile->name;
+      }
+      // Load profile details.
+      $function = $profile->name .'_profile_details';
+      if (function_exists($function)) {
+        $details = $function();
+      }
+
+      // If set, used defined name. Otherwise use file name.
+      $name = isset($details['name']) ? $details['name'] : $profile->name;
+
+      $form['profile'][$name] = array(
+        '#type' => 'radio',
+        '#value' => 'default',
+        '#return_value' => $profile->name,
+        '#title' => $name,
+        '#description' => isset($details['description']) ? $details['description'] : '',
+        '#parents' => array('profile'),
+      );
+    }
+    $form['submit'] =  array(
+      '#type' => 'submit',
+      '#value' => 'Save configuration',
+    );
+
+    drupal_set_title('Select an installation profile');
+    print theme('install_page', drupal_get_form('install_select_profile', $form));
+    exit;
+  }
+}
+
+/**
+ * Show an error page when there are no profiles available.
+ */
+function install_no_profile_error() {
+  drupal_maintenance_theme();
+  drupal_set_title('No profiles available');
+  print theme('install_page', '<p>We were unable to find any installer profiles. Installer profiles tell us what modules to enable and what schema to install in the database. A profile is necessary to continue with the installation process.</p>');
+  exit;
+}
+
+
+/**
+ * Show an error page when Drupal has already been installed.
+ */
+function install_already_done_error() {
+  drupal_maintenance_theme();
+  drupal_set_title('Drupal already installed');
+  print theme('install_page', '<p>Drupal has already been installed on this site. To start over, you must empty your existing database. To install to a different database, edit the appropriate <em>settings.php</em> file in the <em>sites</em> folder.</p>');
+  exit;
+}
+
+/**
+ * Page displayed when the installation is complete. Called from install.php.
+ */
+function install_complete($profile) {
+  global $base_url;
+
+  // Bootstrap newly installed Drupal, while preserving existing messages.
+  $messages = $_SESSION['messages'];
+  drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
+  $_SESSION['messages'] = $messages;
+
+  // Build final page.
+  drupal_maintenance_theme();
+  drupal_set_title(st('%drupal installation complete', array('%drupal' => drupal_install_profile_name())));
+  $output = st('<p>Congratulations, %drupal has been successfully installed.</p>', array('%drupal' => drupal_install_profile_name()));
+
+  // Show profile finalization info.
+  $function = $profile .'_profile_final';
+  if (function_exists($function)) {
+    // More steps required
+    $output .= $function();
+  }
+  else {
+    // No more steps
+    $msg = drupal_set_message() ? 'Please review the messages above before continuing on to <a href="%url">your new site</a>.' : 'You may now visit <a href="%url">your new site</a>';
+    $output .= strtr('<p>'. $msg .'</p>', array('%url' => url('')));
+  }
+
+  // Output page.
+  print theme('maintenance_page', $output);
+}
+
+/**
+ * Send the user to a different installer page. This issues an on-site HTTP
+ * redirect. Messages (and errors) are erased.
+ *
+ * @param $path
+ *   An installer path.
+ */
+function _install_goto($path) {
+  global $base_path;
+  header('Location: '. $base_path . $path);
+  exit();
+}
+
+install_main();
=== added file 'modules/aggregator/aggregator.install'
--- /dev/null	
+++ modules/aggregator/aggregator.install	
@@ -0,0 +1,58 @@
+<?php
+
+function aggregator_install() {
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+      db_query("CREATE TABLE {aggregator_category} (
+        cid int(10) NOT NULL auto_increment,
+        title varchar(255) NOT NULL default '',
+        description longtext NOT NULL,
+        block tinyint(2) NOT NULL default '0',
+        PRIMARY KEY (cid),
+        UNIQUE KEY title (title)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {aggregator_category_feed} (
+        fid int(10) NOT NULL default '0',
+        cid int(10) NOT NULL default '0',
+        PRIMARY KEY (fid,cid)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {aggregator_category_item} (
+        iid int(10) NOT NULL default '0',
+        cid int(10) NOT NULL default '0',
+        PRIMARY KEY (iid,cid)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {aggregator_feed} (
+        fid int(10) NOT NULL auto_increment,
+        title varchar(255) NOT NULL default '',
+        url varchar(255) NOT NULL default '',
+        refresh int(10) NOT NULL default '0',
+        checked int(10) NOT NULL default '0',
+        link varchar(255) NOT NULL default '',
+        description longtext NOT NULL,
+        image longtext NOT NULL,
+        etag varchar(255) NOT NULL default '',
+        modified int(10) NOT NULL default '0',
+        block tinyint(2) NOT NULL default '0',
+        PRIMARY KEY (fid),
+        UNIQUE KEY link (url),
+        UNIQUE KEY title (title)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {aggregator_item} (
+        iid int(10) NOT NULL auto_increment,
+        fid int(10) NOT NULL default '0',
+        title varchar(255) NOT NULL default '',
+        link varchar(255) NOT NULL default '',
+        author varchar(255) NOT NULL default '',
+        description longtext NOT NULL,
+        timestamp int(11) default NULL,
+        PRIMARY KEY (iid)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      break;
+  }
+}
=== added file 'modules/book/book.install'
--- /dev/null	
+++ modules/book/book.install	
@@ -0,0 +1,17 @@
+<?php
+
+function book_install() {
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+      db_query("CREATE TABLE {book} (
+        vid int(10) unsigned NOT NULL default '0',
+        nid int(10) unsigned NOT NULL default '0',
+        parent int(10) NOT NULL default '0',
+        weight tinyint(3) NOT NULL default '0',
+        PRIMARY KEY (vid),
+        KEY nid (nid),
+        KEY parent (parent)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+  }
+}
\ No newline at end of file
=== added file 'modules/contact/contact.install'
--- /dev/null	
+++ modules/contact/contact.install	
@@ -0,0 +1,18 @@
+<?php
+
+function contact_install() {
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+      db_query("CREATE TABLE {contact} (
+        cid int(10) unsigned NOT NULL auto_increment,
+        category varchar(255) NOT NULL default '',
+        recipients longtext NOT NULL default '',
+        reply longtext NOT NULL default '',
+        weight tinyint(3) NOT NULL default '0',
+        selected tinyint(1) NOT NULL default '0',
+        PRIMARY KEY (cid),
+        UNIQUE KEY category (category)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+  }
+}
\ No newline at end of file
=== added file 'modules/drupal/drupal.install'
--- /dev/null	
+++ modules/drupal/drupal.install	
@@ -0,0 +1,29 @@
+<?php
+
+function drupal_install() {
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+      db_query("CREATE TABLE {client} (
+        cid int(10) unsigned NOT NULL auto_increment,
+        link varchar(255) NOT NULL default '',
+        name varchar(128) NOT NULL default '',
+        mail varchar(128) NOT NULL default '',
+        slogan longtext NOT NULL,
+        mission longtext NOT NULL,
+        users int(10) NOT NULL default '0',
+        nodes int(10) NOT NULL default '0',
+        version varchar(35) NOT NULL default'',
+        created int(11) NOT NULL default '0',
+        changed int(11) NOT NULL default '0',
+        PRIMARY KEY (cid)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {client_system} (
+        cid int(10) NOT NULL default '0',
+        name varchar(255) NOT NULL default '',
+        type varchar(255) NOT NULL default '',
+        PRIMARY KEY (cid,name)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+  }
+}
\ No newline at end of file
=== added file 'modules/forum/forum.install'
--- /dev/null	
+++ modules/forum/forum.install	
@@ -0,0 +1,16 @@
+<?php
+
+function forum_install() {
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+      db_query("CREATE TABLE {forum} (
+        nid int(10) unsigned NOT NULL default '0',
+        vid int(10) unsigned NOT NULL default '0',
+        tid int(10) unsigned NOT NULL default '0',
+        PRIMARY KEY (vid),
+        KEY nid (nid),
+        KEY tid (tid)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+  }
+}
\ No newline at end of file
=== added file 'modules/locale/locale.install'
--- /dev/null	
+++ modules/locale/locale.install	
@@ -0,0 +1,37 @@
+<?php
+
+function locale_install() {
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+      db_query("CREATE TABLE {locales_meta} (
+        locale varchar(12) NOT NULL default '',
+        name varchar(64) NOT NULL default '',
+        enabled int(2) NOT NULL default '0',
+        isdefault int(2) NOT NULL default '0',
+        plurals int(1) NOT NULL default '0',
+        formula varchar(128) NOT NULL default '',
+        PRIMARY KEY (locale)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {locales_source} (
+        lid int(11) NOT NULL auto_increment,
+        location varchar(255) NOT NULL default '',
+        source blob NOT NULL,
+        PRIMARY KEY (lid)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {locales_target} (
+        lid int(11) NOT NULL default '0',
+        translation blob NOT NULL,
+        locale varchar(12) NOT NULL default '',
+        plid int(11) NOT NULL default '0',
+        plural int(1) NOT NULL default '0',
+        KEY lid (lid),
+        KEY lang (locale),
+        KEY plid (plid),
+        KEY plural (plural)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+  }
+  db_query("INSERT INTO {locales_meta} (locale, name, enabled, isdefault) VALUES ('en', 'English', '1', '1')");
+}
=== added file 'modules/poll/poll.install'
--- /dev/null	
+++ modules/poll/poll.install	
@@ -0,0 +1,34 @@
+<?php
+
+function poll_install() {
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+      db_query("CREATE TABLE {poll} (
+        nid int(10) unsigned NOT NULL default '0',
+        runtime int(10) NOT NULL default '0',
+        active int(2) unsigned NOT NULL default '0',
+        PRIMARY KEY (nid)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {poll_votes} (
+        nid int(10) unsigned NOT NULL,
+        uid int(10) unsigned NOT NULL default 0,
+        chorder int(10) NOT NULL default -1,
+        hostname varchar(128) NOT NULL default '',
+        INDEX (nid),
+        INDEX (uid),
+        INDEX (hostname)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {poll_choices} (
+        chid int(10) unsigned NOT NULL auto_increment,
+        nid int(10) unsigned NOT NULL default '0',
+        chtext varchar(128) NOT NULL default '',
+        chvotes int(6) NOT NULL default '0',
+        chorder int(2) NOT NULL default '0',
+        PRIMARY KEY (chid),
+        KEY nid (nid)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+  }
+}
=== added file 'modules/profile/profile.install'
--- /dev/null	
+++ modules/profile/profile.install	
@@ -0,0 +1,34 @@
+<?php
+
+function profile_install() {
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+      db_query("CREATE TABLE {profile_fields} (
+        fid int(10) NOT NULL auto_increment,
+        title varchar(255) default NULL,
+        name varchar(128) default NULL,
+        explanation TEXT default NULL,
+        category varchar(255) default NULL,
+        page varchar(255) default NULL,
+        type varchar(128) default NULL,
+        weight tinyint(1) DEFAULT '0' NOT NULL,
+        required tinyint(1) DEFAULT '0' NOT NULL,
+        register tinyint(1) DEFAULT '0' NOT NULL,
+        visibility tinyint(1) DEFAULT '0' NOT NULL,
+        autocomplete tinyint(1) DEFAULT '0' NOT NULL,
+        options text,
+        KEY category (category),
+        UNIQUE KEY name (name),
+        PRIMARY KEY (fid)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {profile_values} (
+        fid int(10) unsigned default '0',
+        uid int(10) unsigned default '0',
+        value text,
+        KEY uid (uid),
+        KEY fid (fid)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+  }
+}
\ No newline at end of file
=== added file 'modules/search/search.install'
--- /dev/null	
+++ modules/search/search.install	
@@ -0,0 +1,32 @@
+<?php
+
+function search_install() {
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+      db_query("CREATE TABLE {search_dataset} (
+        sid int(10) unsigned NOT NULL default '0',
+        type varchar(16) default NULL,
+        data longtext NOT NULL,
+        KEY sid_type (sid, type)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {search_index} (
+        word varchar(50) NOT NULL default '',
+        sid int(10) unsigned NOT NULL default '0',
+        type varchar(16) default NULL,
+        fromsid int(10) unsigned NOT NULL default '0',
+        fromtype varchar(16) default NULL,
+        score float default NULL,
+        KEY sid_type (sid, type),
+        KEY from_sid_type (fromsid, fromtype),
+        KEY word (word)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {search_total} (
+        word varchar(50) NOT NULL default '',
+        count float default NULL,
+        PRIMARY KEY (word)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+  }
+}
\ No newline at end of file
=== added file 'modules/statistics/statistics.install'
--- /dev/null	
+++ modules/statistics/statistics.install	
@@ -0,0 +1,21 @@
+<?php
+
+function statistics_install() {
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+      db_query("CREATE TABLE {accesslog} (
+        aid int(10) NOT NULL auto_increment,
+        sid varchar(32) NOT NULL default '',
+        title varchar(255) default NULL,
+        path varchar(255) default NULL,
+        url varchar(255) default NULL,
+        hostname varchar(128) default NULL,
+        uid int(10) unsigned default '0',
+        timer int(10) unsigned NOT NULL default '0',
+        timestamp int(11) unsigned NOT NULL default '0',
+        KEY accesslog_timestamp (timestamp),
+        PRIMARY KEY (aid)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+  }
+}
\ No newline at end of file
=== added file 'modules/system/system.install'
--- /dev/null	
+++ modules/system/system.install	
@@ -0,0 +1,2525 @@
+<?php
+
+function system_install() {
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+      db_query("CREATE TABLE {access} (
+        aid tinyint(10) NOT NULL auto_increment,
+        mask varchar(255) NOT NULL default '',
+        type varchar(255) NOT NULL default '',
+        status tinyint(2) NOT NULL default '0',
+        PRIMARY KEY (aid)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {authmap} (
+        aid int(10) unsigned NOT NULL auto_increment,
+        uid int(10) NOT NULL default '0',
+        authname varchar(128) NOT NULL default '',
+        module varchar(128) NOT NULL default '',
+        PRIMARY KEY (aid),
+        UNIQUE KEY authname (authname)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {blocks} (
+        module varchar(64) DEFAULT '' NOT NULL,
+        delta varchar(32) NOT NULL default '0',
+        theme varchar(255) NOT NULL default '',
+        status tinyint(2) DEFAULT '0' NOT NULL,
+        weight tinyint(1) DEFAULT '0' NOT NULL,
+        region varchar(64) DEFAULT 'left' NOT NULL,
+        custom tinyint(2) DEFAULT '0' NOT NULL,
+        throttle tinyint(1) DEFAULT '0' NOT NULL,
+        visibility tinyint(1) DEFAULT '0' NOT NULL,
+        pages text DEFAULT '' NOT NULL
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {boxes} (
+        bid tinyint(4) NOT NULL auto_increment,
+        title varchar(64) NOT NULL default '',
+        body longtext,
+        info varchar(128) NOT NULL default '',
+        format int(4) NOT NULL default '0',
+        PRIMARY KEY (bid),
+        UNIQUE KEY info (info)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {cache} (
+        cid varchar(255) NOT NULL default '',
+        data longblob,
+        expire int(11) NOT NULL default '0',
+        created int(11) NOT NULL default '0',
+        headers text,
+        PRIMARY KEY (cid),
+        INDEX expire (expire)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {comments} (
+        cid int(10) NOT NULL auto_increment,
+        pid int(10) NOT NULL default '0',
+        nid int(10) NOT NULL default '0',
+        uid int(10) NOT NULL default '0',
+        subject varchar(64) NOT NULL default '',
+        comment longtext NOT NULL,
+        hostname varchar(128) NOT NULL default '',
+        timestamp int(11) NOT NULL default '0',
+        score mediumint(9) NOT NULL default '0',
+        status tinyint(3) unsigned NOT NULL default '0',
+        format int(4) NOT NULL default '0',
+        thread varchar(255) NOT NULL,
+        users longtext,
+        name varchar(60) default NULL,
+        mail varchar(64) default NULL,
+        homepage varchar(255) default NULL,
+        PRIMARY KEY (cid),
+        KEY lid (nid)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {node_comment_statistics} (
+        nid int(10) unsigned NOT NULL auto_increment,
+        last_comment_timestamp int(11) NOT NULL default '0',
+        last_comment_name varchar(60) default NULL,
+        last_comment_uid int(10) NOT NULL default '0',
+        comment_count int(10) unsigned NOT NULL default '0',
+        PRIMARY KEY (nid),
+        KEY node_comment_timestamp (last_comment_timestamp)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {files} (
+        fid int(10) unsigned NOT NULL default 0,
+        nid int(10) unsigned NOT NULL default 0,
+        filename varchar(255) NOT NULL default '',
+        filepath varchar(255) NOT NULL default '',
+        filemime varchar(255) NOT NULL default '',
+        filesize int(10) unsigned NOT NULL default 0,
+        PRIMARY KEY (fid)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {file_revisions} (
+        fid int(10) unsigned NOT NULL default 0,
+        vid int(10) unsigned NOT NULL default 0,
+        description varchar(255) NOT NULL default '',
+        list tinyint(1) unsigned NOT NULL default 0,
+        PRIMARY KEY (fid, vid)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {filter_formats} (
+        format int(4) NOT NULL auto_increment,
+        name varchar(255) NOT NULL default '',
+        roles varchar(255) NOT NULL default '',
+        cache tinyint(2) NOT NULL default '0',
+        PRIMARY KEY (format),
+        UNIQUE KEY (name)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {filters} (
+        format int(4) NOT NULL default '0',
+        module varchar(64) NOT NULL default '',
+        delta tinyint(2) DEFAULT '0' NOT NULL,
+        weight tinyint(2) DEFAULT '0' NOT NULL,
+        INDEX (weight)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {flood} (
+        event varchar(64) NOT NULL default '',
+        hostname varchar(128) NOT NULL default '',
+        timestamp int(11) NOT NULL default '0'
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {history} (
+        uid int(10) NOT NULL default '0',
+        nid int(10) NOT NULL default '0',
+        timestamp int(11) NOT NULL default '0',
+        PRIMARY KEY (uid,nid)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {menu} (
+        mid int(10) unsigned NOT NULL default '0',
+        pid int(10) unsigned NOT NULL default '0',
+        path varchar(255) NOT NULL default '',
+        title varchar(255) NOT NULL default '',
+        description varchar(255) NOT NULL default '',
+        weight tinyint(4) NOT NULL default '0',
+        type int(2) unsigned NOT NULL default '0',
+        PRIMARY KEY (mid)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+
+      db_query("CREATE TABLE {node} (
+        nid int(10) unsigned NOT NULL auto_increment,
+        vid int(10) unsigned NOT NULL default '0',
+        type varchar(32) NOT NULL default '',
+        title varchar(128) NOT NULL default '',
+        uid int(10) NOT NULL default '0',
+        status int(4) NOT NULL default '1',
+        created int(11) NOT NULL default '0',
+        changed int(11) NOT NULL default '0',
+        comment int(2) NOT NULL default '0',
+        promote int(2) NOT NULL default '0',
+        moderate int(2) NOT NULL default '0',
+        sticky int(2) NOT NULL default '0',
+        PRIMARY KEY  (nid, vid),
+        UNIQUE KEY vid (vid),
+        KEY node_type (type(4)),
+        KEY node_title_type (title, type(4)),
+        KEY status (status),
+        KEY uid (uid),
+        KEY node_moderate (moderate),
+        KEY node_promote_status (promote, status),
+        KEY node_created (created),
+        KEY node_changed (changed),
+        KEY node_status_type (status, type, nid),
+        KEY nid (nid)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {node_access} (
+        nid int(10) unsigned NOT NULL default '0',
+        gid int(10) unsigned NOT NULL default '0',
+        realm varchar(255) NOT NULL default '',
+        grant_view tinyint(1) unsigned NOT NULL default '0',
+        grant_update tinyint(1) unsigned NOT NULL default '0',
+        grant_delete tinyint(1) unsigned NOT NULL default '0',
+        PRIMARY KEY (nid,gid,realm)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {node_revisions} (
+        nid int(10) unsigned NOT NULL,
+        vid int(10) unsigned NOT NULL,
+        uid int(10) NOT NULL default '0',
+        title varchar(128) NOT NULL default '',
+        body longtext NOT NULL default '',
+        teaser longtext NOT NULL default '',
+        log longtext NOT NULL default '',
+        timestamp int(11) NOT NULL default '0',
+        format int(4) NOT NULL default '0',
+        PRIMARY KEY  (vid),
+        KEY nid (nid),
+        KEY uid (uid)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {url_alias} (
+        pid int(10) unsigned NOT NULL auto_increment,
+        src varchar(128) NOT NULL default '',
+        dst varchar(128) NOT NULL default '',
+        PRIMARY KEY (pid),
+        UNIQUE KEY dst (dst),
+        KEY src (src)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {permission} (
+        rid int(10) unsigned NOT NULL default '0',
+        perm longtext,
+        tid int(10) unsigned NOT NULL default '0',
+        KEY rid (rid)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {role} (
+        rid int(10) unsigned NOT NULL auto_increment,
+        name varchar(32) NOT NULL default '',
+        PRIMARY KEY (rid),
+        UNIQUE KEY name (name)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {blocks_roles} (
+        module varchar(64) NOT NULL,
+        delta varchar(32) NOT NULL,
+        rid int(10) unsigned NOT NULL,
+        PRIMARY KEY (module, delta, rid)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {sessions} (
+        uid int(10) unsigned NOT NULL,
+        sid varchar(32) NOT NULL default '',
+        hostname varchar(128) NOT NULL default '',
+        timestamp int(11) NOT NULL default '0',
+        cache int(11) NOT NULL default '0',
+        session longtext,
+        KEY uid (uid),
+        PRIMARY KEY (sid),
+        KEY timestamp (timestamp)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {sequences} (
+        name varchar(255) NOT NULL default '',
+        id int(10) unsigned NOT NULL default '0',
+        PRIMARY KEY (name)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {node_counter} (
+        nid int(10) NOT NULL default '0',
+        totalcount bigint(20) unsigned NOT NULL default '0',
+        daycount mediumint(8) unsigned NOT NULL default '0',
+        timestamp int(11) unsigned NOT NULL default '0',
+        PRIMARY KEY (nid),
+        KEY totalcount (totalcount),
+        KEY daycount (daycount),
+        KEY timestamp (timestamp)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {system} (
+        filename varchar(255) NOT NULL default '',
+        name varchar(255) NOT NULL default '',
+        type varchar(255) NOT NULL default '',
+        description varchar(255) NOT NULL default '',
+        status int(2) NOT NULL default '0',
+        throttle tinyint(1) DEFAULT '0' NOT NULL,
+        bootstrap int(2) NOT NULL default '0',
+        schema_version smallint(3) NOT NULL default -1,
+        weight int(2) NOT NULL default '0',
+        PRIMARY KEY (filename),
+        KEY (weight)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {term_data} (
+        tid int(10) unsigned NOT NULL auto_increment,
+        vid int(10) unsigned NOT NULL default '0',
+        name varchar(255) NOT NULL default '',
+        description longtext,
+        weight tinyint(4) NOT NULL default '0',
+        PRIMARY KEY (tid),
+        KEY vid (vid)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {term_hierarchy} (
+        tid int(10) unsigned NOT NULL default '0',
+        parent int(10) unsigned NOT NULL default '0',
+        KEY tid (tid),
+        KEY parent (parent),
+        PRIMARY KEY (tid, parent)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {term_node} (
+        nid int(10) unsigned NOT NULL default '0',
+        tid int(10) unsigned NOT NULL default '0',
+        KEY nid (nid),
+        KEY tid (tid),
+        PRIMARY KEY (tid,nid)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {term_relation} (
+        tid1 int(10) unsigned NOT NULL default '0',
+        tid2 int(10) unsigned NOT NULL default '0',
+        KEY tid1 (tid1),
+        KEY tid2 (tid2)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {term_synonym} (
+        tid int(10) unsigned NOT NULL default '0',
+        name varchar(255) NOT NULL default '',
+        KEY tid (tid),
+        KEY name (name(3))
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {users} (
+        uid int(10) unsigned NOT NULL default '0',
+        name varchar(60) NOT NULL default '',
+        pass varchar(32) NOT NULL default '',
+        mail varchar(64) default '',
+        mode tinyint(1) NOT NULL default '0',
+        sort tinyint(1) default '0',
+        threshold tinyint(1) default '0',
+        theme varchar(255) NOT NULL default '',
+        signature varchar(255) NOT NULL default '',
+        created int(11) NOT NULL default '0',
+        access int(11) NOT NULL default '0',
+        login int(11) NOT NULL default '0',
+        status tinyint(4) NOT NULL default '0',
+        timezone varchar(8) default NULL,
+        language varchar(12) NOT NULL default '',
+        picture varchar(255) NOT NULL DEFAULT '',
+        init varchar(64) default '',
+        data longtext,
+        PRIMARY KEY (uid),
+        UNIQUE KEY name (name),
+        KEY access (access)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {users_roles} (
+        uid int(10) unsigned NOT NULL default '0',
+        rid int(10) unsigned NOT NULL default '0',
+        PRIMARY KEY (uid, rid)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {variable} (
+        name varchar(48) NOT NULL default '',
+        value longtext NOT NULL,
+        PRIMARY KEY (name)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {vocabulary} (
+        vid int(10) unsigned NOT NULL auto_increment,
+        name varchar(255) NOT NULL default '',
+        description longtext,
+        help varchar(255) NOT NULL default '',
+        relations tinyint(3) unsigned NOT NULL default '0',
+        hierarchy tinyint(3) unsigned NOT NULL default '0',
+        multiple tinyint(3) unsigned NOT NULL default '0',
+        required tinyint(3) unsigned NOT NULL default '0',
+        tags tinyint(3) unsigned NOT NULL default '0',
+        module varchar(255) NOT NULL default '',
+        weight tinyint(4) NOT NULL default '0',
+        PRIMARY KEY (vid)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {vocabulary_node_types} (
+        vid int(10) unsigned NOT NULL DEFAULT '0',
+        type varchar(32) NOT NULL DEFAULT '',
+        PRIMARY KEY (vid, type)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {watchdog} (
+        wid int(5) NOT NULL auto_increment,
+        uid int(10) NOT NULL default '0',
+        type varchar(16) NOT NULL default '',
+        message longtext NOT NULL,
+        severity tinyint(3) unsigned NOT NULL default '0',
+        link varchar(255) NOT NULL default '',
+        location varchar(128) NOT NULL default '',
+        referer varchar(128) NOT NULL default '',
+        hostname varchar(128) NOT NULL default '',
+        timestamp int(11) NOT NULL default '0',
+        PRIMARY KEY (wid)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      break;
+    case 'pgsql':
+      break;
+
+  }
+  db_query("INSERT INTO {system} (filename, name, type, description, status, throttle, bootstrap, schema_version) VALUES ('themes/engines/phptemplate/phptemplate.engine', 'phptemplate', 'theme_engine', '', 1, 0, 0, 0)");
+  db_query("INSERT INTO {system} (filename, name, type, description, status, throttle, bootstrap, schema_version) VALUES ('themes/bluemarine/page.tpl.php', 'bluemarine', 'theme', 'themes/engines/phptemplate/phptemplate.engine', 1, 0, 0, 0)");
+
+  db_query("INSERT INTO {users} (uid,name,mail) VALUES(0,'','')");
+
+  db_query("INSERT INTO {role} (name) VALUES ('anonymous user')");
+  db_query("INSERT INTO {role} (name) VALUES ('authenticated user')");
+
+  db_query("INSERT INTO {permission} VALUES (1,'access content',0)");
+  db_query("INSERT INTO {permission} VALUES (2,'access comments, access content, post comments, post comments without approval',0)");
+
+  db_query("INSERT INTO {variable} (name,value) VALUES('theme_default', 's:10:\"bluemarine\";')");
+
+  db_query("INSERT INTO {blocks} (module,delta,theme,status) VALUES('user', 0, 'bluemarine', 1)");
+  db_query("INSERT INTO {blocks} (module,delta,theme,status) VALUES('user', 1, 'bluemarine', 1)");
+
+  db_query("INSERT INTO {node_access} VALUES (0, 0, 'all', 1, 0, 0)");
+
+  db_query("INSERT INTO {filter_formats} (name, roles, cache) VALUES ('Filtered HTML',',1,2,',1)");
+  db_query("INSERT INTO {filter_formats} (name, roles, cache) VALUES ('PHP code','',0)");
+  db_query("INSERT INTO {filter_formats} (name, roles, cache) VALUES ('Full HTML','',1)");
+  db_query("INSERT INTO {filters} VALUES (1,'filter',0,0)");
+  db_query("INSERT INTO {filters} VALUES (1,'filter',2,1)");
+  db_query("INSERT INTO {filters} VALUES (2,'filter',1,0)");
+  db_query("INSERT INTO {filters} VALUES (3,'filter',2,0)");
+  db_query("INSERT INTO {variable} (name,value) VALUES ('filter_html_1','i:1;')");
+
+  db_query("INSERT INTO {variable} (name, value) VALUES ('node_options_forum', 'a:1:{i:0;s:6:\"status\";}')");
+
+  db_query("INSERT INTO {menu} (pid, path, title, description, weight, type) VALUES (0, '', 'Primary links', '', 0, 115)");
+  db_query("INSERT INTO {variable} VALUES ('menu_primary_menu', 'i:2;')");
+  db_query("INSERT INTO {variable} VALUES ('menu_secondary_menu', 'i:2;')");
+}
+
+// Updates for core
+
+function system_update_110() {
+  $ret = array();
+
+  // TODO: needs PGSQL version
+  if ($GLOBALS['db_type'] == 'mysql') {
+    /*
+    ** Search
+    */
+
+    $ret[] = update_sql('DROP TABLE {search_index}');
+    $ret[] = update_sql("CREATE TABLE {search_index} (
+      word varchar(50) NOT NULL default '',
+      sid int(10) unsigned NOT NULL default '0',
+      type varchar(16) default NULL,
+      fromsid int(10) unsigned NOT NULL default '0',
+      fromtype varchar(16) default NULL,
+      score int(10) unsigned default NULL,
+      KEY sid (sid),
+      KEY fromsid (fromsid),
+      KEY word (word)
+      )");
+
+    $ret[] = update_sql("CREATE TABLE {search_total} (
+      word varchar(50) NOT NULL default '',
+      count int(10) unsigned default NULL,
+      PRIMARY KEY word (word)
+      )");
+
+
+    /*
+    ** Blocks
+    */
+
+    $ret[] = update_sql('ALTER TABLE {blocks} DROP path');
+    $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') {
+    /*
+    ** Search
+    */
+    $ret[] = update_sql('DROP TABLE {search_index}');
+    $ret[] = update_sql("CREATE TABLE {search_index} (
+      word varchar(50) NOT NULL default '',
+      sid integer NOT NULL default '0',
+      type varchar(16) default NULL,
+      fromsid integer NOT NULL default '0',
+      fromtype varchar(16) default NULL,
+      score integer default NULL
+      )");
+    $ret[] = update_sql("CREATE INDEX {search_index}_sid_idx on {search_index}(sid)");
+    $ret[] = update_sql("CREATE INDEX {search_index}_fromsid_idx on {search_index}(fromsid)");
+    $ret[] = update_sql("CREATE INDEX {search_index}_word_idx on {search_index}(word)");
+
+    $ret[] = update_sql("CREATE TABLE {search_total} (
+      word varchar(50) NOT NULL default '' PRIMARY KEY,
+      count integer default NULL
+      )");
+
+
+    /*
+    ** Blocks
+    */
+    // Postgres can only drop columns since 7.4
+    #$ret[] = update_sql('ALTER TABLE {blocks} DROP path');
+
+    $ret[] = update_sql('ALTER TABLE {blocks} ADD visibility smallint');
+    $ret[] = update_sql("ALTER TABLE {blocks} ALTER COLUMN visibility set default 0");
+    $ret[] = update_sql('UPDATE {blocks} SET visibility = 0');
+    $ret[] = update_sql('ALTER TABLE {blocks} ALTER COLUMN visibility SET NOT NULL');
+    $ret[] = update_sql('ALTER TABLE {blocks} ADD pages text');
+    $ret[] = update_sql("ALTER TABLE {blocks} ALTER COLUMN pages set default ''");
+    $ret[] = update_sql("UPDATE {blocks} SET pages = ''");
+    $ret[] = update_sql('ALTER TABLE {blocks} ALTER COLUMN pages SET NOT NULL');
+
+  }
+
+  $ret[] = update_sql("DELETE FROM {variable} WHERE name = 'node_cron_last'");
+
+  $ret[] = update_sql('UPDATE {blocks} SET status = 1, custom = 2 WHERE status = 0 AND custom = 1');
+
+  return $ret;
+}
+
+function system_update_111() {
+  $ret = array();
+
+  $ret[] = update_sql("DELETE FROM {variable} WHERE name LIKE 'throttle_%'");
+
+  if ($GLOBALS['db_type'] == 'mysql') {
+    $ret[] = update_sql('ALTER TABLE {sessions} ADD PRIMARY KEY sid (sid)');
+  }
+  elseif ($GLOBALS['db_type'] == 'pgsql') {
+    $ret[] = update_sql('ALTER TABLE {sessions} ADD UNIQUE(sid)');
+  }
+
+  return $ret;
+}
+
+function system_update_112() {
+  $ret = array();
+
+  if ($GLOBALS['db_type'] == 'mysql') {
+    $ret[] = update_sql("CREATE TABLE {flood} (
+      event varchar(64) NOT NULL default '',
+      hostname varchar(128) NOT NULL default '',
+      timestamp int(11) NOT NULL default '0'
+     );");
+  }
+  elseif ($GLOBALS['db_type'] == 'pgsql') {
+    $ret[] = update_sql("CREATE TABLE {flood} (
+      event varchar(64) NOT NULL default '',
+      hostname varchar(128) NOT NULL default '',
+      timestamp integer NOT NULL default 0
+     );");
+  }
+
+  return $ret;
+}
+
+function system_update_113() {
+  $ret = array();
+
+  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') {
+    $ret[] = update_sql("SELECT * INTO TEMPORARY {accesslog}_t FROM {accesslog}");
+    $ret[] = update_sql("DROP TABLE {accesslog}");
+    $ret[] = update_sql("CREATE TABLE {accesslog} (
+      aid serial,
+      title varchar(255) default NULL,
+      path varchar(255) default NULL,
+      url varchar(255) default NULL,
+      hostname varchar(128) default NULL,
+      uid integer default '0',
+      timestamp integer NOT NULL default '0'
+    )");
+    $ret[] = update_sql("INSERT INTO {accesslog} (title, path, url, hostname, uid, timestamp) SELECT title, path, url, hostname, uid, timestamp FROM {accesslog}_t");
+
+    $ret[] = update_sql("DROP TABLE {accesslog}_t");
+    $ret[] = update_sql("CREATE INDEX {accesslog}_timestamp_idx ON {accesslog} (timestamp);");
+
+  }
+
+  // Flush the menu cache:
+  cache_clear_all('menu:', TRUE);
+
+  return $ret;
+}
+
+function system_update_114() {
+  $ret = array();
+  if ($GLOBALS['db_type'] == 'mysql') {
+    $ret[] = update_sql("CREATE TABLE {queue} (
+      nid int(10) unsigned NOT NULL,
+      uid int(10) unsigned NOT NULL,
+      vote int(3) NOT NULL default '0',
+      PRIMARY KEY (nid, uid)
+     )");
+  }
+  else if ($GLOBALS['db_type'] == 'pgsql') {
+    $ret[] = update_sql("CREATE TABLE {queue} (
+      nid integer NOT NULL default '0',
+      uid integer NOT NULL default '0',
+      vote integer NOT NULL default '0',
+      PRIMARY KEY (nid, uid)
+    )");
+    $ret[] = update_sql("CREATE INDEX {queue}_nid_idx ON queue(nid)");
+    $ret[] = update_sql("CREATE INDEX {queue}_uid_idx ON queue(uid)");
+  }
+
+  $result = db_query("SELECT nid, votes, score, users FROM {node}");
+  while ($node = db_fetch_object($result)) {
+    if (isset($node->users)) {
+      $arr = explode(',', $node->users);
+      unset($node->users);
+      foreach ($arr as $value) {
+        $arr2 = explode('=', trim($value));
+        if (isset($arr2[0]) && isset($arr2[1])) {
+          switch ($arr2[1]) {
+            case '+ 1':
+              db_query("INSERT INTO {queue} (nid, uid, vote) VALUES (%d, %d, %d)", $node->nid, (int)$arr2[0], 1);
+              break;
+            case '- 1':
+              db_query("INSERT INTO {queue} (nid, uid, vote) VALUES (%d, %d, %d)", $node->nid, (int)$arr2[0], -1);
+              break;
+            default:
+              db_query("INSERT INTO {queue} (nid, uid, vote) VALUES (%d, %d, %d)", $node->nid, (int)$arr2[0], 0);
+          }
+        }
+      }
+    }
+  }
+
+  if ($GLOBALS['db_type'] == 'mysql') {
+    // Postgres only supports dropping of columns since 7.4
+    $ret[] = update_sql("ALTER TABLE {node} DROP votes");
+    $ret[] = update_sql("ALTER TABLE {node} DROP score");
+    $ret[] = update_sql("ALTER TABLE {node} DROP users");
+  }
+
+  return $ret;
+}
+
+function system_update_115() {
+  $ret = array();
+
+  // This update has been moved to update_fix_watchdog_115 in update.php because it
+  // is needed for the basic functioning of the update script.
+
+  return $ret;
+}
+
+function system_update_116() {
+  return array(update_sql("DELETE FROM {system} WHERE name = 'admin'"));
+}
+
+function system_update_117() {
+  $ret = array();
+  if ($GLOBALS['db_type'] == 'mysql') {
+    $ret[] = update_sql("CREATE TABLE {vocabulary_node_types} (
+                         vid int(10) NOT NULL default '0',
+                         type varchar(16) NOT NULL default '',
+                         PRIMARY KEY (vid, type))");
+  }
+  else if ($GLOBALS['db_type'] == 'pgsql') {
+    $ret[] = update_sql("CREATE TABLE {vocabulary_node_types} (
+                         vid serial,
+                         type varchar(16) NOT NULL default '',
+                          PRIMARY KEY (vid, type)) ");
+  }
+  return $ret;
+}
+
+function system_update_118() {
+  $ret = array();
+  $node_types = array();
+  $result = db_query('SELECT vid, nodes FROM {vocabulary}');
+  while ($vocabulary = db_fetch_object($result)) {
+    $node_types[$vocabulary->vid] = explode(',', $vocabulary->nodes);
+  }
+  foreach ($node_types as $vid => $type_array) {
+    foreach ($type_array as $type) {
+      db_query("INSERT INTO {vocabulary_node_types} (vid, type) VALUES (%d, '%s')", $vid, $type);
+    }
+  }
+  if ($GLOBALS['db_type'] == 'mysql') {
+    $ret[] = update_sql("ALTER TABLE {vocabulary} DROP nodes");
+  }
+  return $ret;
+}
+
+function system_update_119() {
+  $ret = array();
+
+  foreach (node_get_types() as $type => $name) {
+    $node_options = array();
+    if (variable_get('node_status_'. $type, 1)) {
+      $node_options[] = 'status';
+    }
+    if (variable_get('node_moderate_'. $type, 0)) {
+      $node_options[] = 'moderate';
+    }
+    if (variable_get('node_promote_'. $type, 1)) {
+      $node_options[] = 'promote';
+    }
+    if (variable_get('node_sticky_'. $type, 0)) {
+      $node_options[] = 'sticky';
+    }
+    if (variable_get('node_revision_'. $type, 0)) {
+      $node_options[] = 'revision';
+    }
+    variable_set('node_options_'. $type, $node_options);
+    variable_del('node_status_'. $type);
+    variable_del('node_moderate_'. $type);
+    variable_del('node_promote_'. $type);
+    variable_del('node_sticky_'. $type);
+    variable_del('node_revision_'. $type);
+  }
+
+  return $ret;
+}
+
+function system_update_120() {
+  $ret = array();
+
+  // Rewrite old URL aliases. Works for both PostgreSQL and MySQL
+  $result = db_query("SELECT pid, src FROM {url_alias} WHERE src LIKE 'blog/%%'");
+  while ($alias = db_fetch_object($result)) {
+    list(, $page, $op, $uid) = explode('/', $alias->src);
+    if ($page == 'feed') {
+      $new = "blog/$uid/feed";
+      update_sql("UPDATE {url_alias} SET src = '%s' WHERE pid = '%s'", $new, $alias->pid);
+    }
+  }
+
+  return $ret;
+}
+
+function system_update_121() {
+  $ret = array();
+
+  // Remove the unused page table.
+  $ret[] = update_sql('DROP TABLE {page}');
+
+  return $ret;
+}
+
+function system_update_122() {
+
+  $ret = array();
+  $ret[] = update_sql("ALTER TABLE {blocks} ADD types text");
+  return $ret;
+
+}
+
+function system_update_123() {
+  $ret = array();
+
+  if ($GLOBALS['db_type'] == 'mysql') {
+    $ret[] = update_sql("ALTER TABLE {vocabulary} ADD module varchar(255) NOT NULL default ''");
+  }
+  elseif ($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");
+    $ret[] = update_sql("ALTER TABLE {vocabulary} ALTER COLUMN module SET DEFAULT ''");
+  }
+
+  $ret[] = update_sql("UPDATE {vocabulary} SET module = 'taxonomy'");
+  $vid = variable_get('forum_nav_vocabulary', '');
+  if (!empty($vid)) {
+    $ret[] = update_sql("UPDATE {vocabulary} SET module = 'forum' WHERE vid = " . $vid);
+  }
+
+  return $ret;
+}
+
+function system_update_124() {
+  $ret = array();
+
+  if ($GLOBALS['db_type'] == 'mysql') {
+    // redo update_105, correctly creating node_comment_statistics
+    $ret[] = update_sql("DROP TABLE IF EXISTS {node_comment_statistics}");
+
+    $ret[] = update_sql("CREATE TABLE {node_comment_statistics} (
+      nid int(10) unsigned NOT NULL auto_increment,
+      last_comment_timestamp int(11) NOT NULL default '0',
+      last_comment_name varchar(60) default NULL,
+      last_comment_uid int(10) NOT NULL default '0',
+      comment_count int(10) unsigned NOT NULL default '0',
+      PRIMARY KEY (nid),
+      KEY node_comment_timestamp (last_comment_timestamp)
+      )");
+  }
+
+  else {
+    // also drop incorrectly named table for PostgreSQL
+    $ret[] = update_sql("DROP TABLE {node}_comment_statistics");
+
+    $ret[] = update_sql("CREATE TABLE {node_comment_statistics} (
+      nid integer NOT NULL,
+      last_comment_timestamp integer NOT NULL default '0',
+      last_comment_name varchar(60)  default NULL,
+      last_comment_uid integer NOT NULL default '0',
+      comment_count integer NOT NULL default '0',
+      PRIMARY KEY (nid)
+    )");
+
+    $ret[] = update_sql("CREATE INDEX {node_comment_statistics}_timestamp_idx ON {node_comment_statistics}(last_comment_timestamp);
+");
+  }
+
+  // initialize table
+  $ret[] = update_sql("INSERT INTO {node_comment_statistics} (nid, last_comment_timestamp, last_comment_name, last_comment_uid, comment_count) SELECT n.nid, n.changed, NULL, 0, 0 FROM {node} n");
+
+  // fill table
+  $result = db_query("SELECT c.nid, c.timestamp, c.name, c.uid, COUNT(c.nid) as comment_count FROM {node} n LEFT JOIN {comments} c ON c.nid = n.nid WHERE c.status = 0 GROUP BY c.nid, c.timestamp, c.name, c.uid");
+  while ($comment_record = db_fetch_object($result)) {
+    $count = db_result(db_query('SELECT COUNT(cid) FROM {comments} WHERE nid = %d AND status = 0', $comment_record->nid));
+    db_query("UPDATE {node_comment_statistics} SET comment_count = %d, last_comment_timestamp = %d, last_comment_name = '%s', last_comment_uid = %d WHERE nid = %d", $count, $comment_record->timestamp, $comment_record->name, $comment_record->uid, $comment_record->nid);
+  }
+
+  return $ret;
+}
+
+function system_update_125() {
+  // Postgres only update.
+  $ret = array();
+
+  if ($GLOBALS['db_type'] == 'pgsql') {
+
+    $ret[] = update_sql("CREATE OR REPLACE FUNCTION if(boolean, anyelement, anyelement) RETURNS anyelement AS '
+          SELECT CASE WHEN $1 THEN $2 ELSE $3 END;
+        ' LANGUAGE 'sql'");
+
+    $ret[] = update_sql("CREATE FUNCTION greatest(integer, integer, integer) RETURNS integer AS '
+                          SELECT greatest($1, greatest($2, $3));
+                        ' LANGUAGE 'sql'");
+
+  }
+
+  return $ret;
+}
+
+function system_update_126() {
+  variable_set('forum_block_num_0', variable_get('forum_block_num', 5));
+  variable_set('forum_block_num_1', variable_get('forum_block_num', 5));
+  variable_del('forum_block_num');
+
+  return array();
+}
+
+function system_update_127() {
+  $ret = array();
+  if ($GLOBALS['db_type'] == 'pgsql') {
+    $ret[] = update_sql("ALTER TABLE {poll} RENAME voters TO polled");
+  }
+  else if ($GLOBALS['db_type'] == 'mysql') {
+    $ret[] = update_sql("ALTER TABLE {poll} CHANGE voters polled longtext");
+  }
+  return $ret;
+}
+
+function system_update_128() {
+  $ret = array();
+
+  if ($GLOBALS['db_type'] == 'mysql') {
+    $ret[] = update_sql('ALTER TABLE {term_node} ADD PRIMARY KEY (tid,nid)');
+  }
+  elseif ($GLOBALS['db_type'] == 'pgsql') {
+    $ret[] = update_sql('ALTER TABLE {term_node} ADD PRIMARY KEY (tid,nid)');
+  }
+
+  return $ret;
+}
+
+function system_update_129() {
+  $ret = array();
+
+  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') {
+    db_add_column($ret, 'vocabulary', 'tags', 'smallint', array('default' => 0, 'not null' => TRUE));
+  }
+
+  return $ret;
+}
+
+function system_update_130() {
+  $ret = array();
+
+  // This update has been moved to update_fix_sessions in update.php because it
+  // is needed for the basic functioning of the update script.
+
+  return $ret;
+}
+
+function system_update_131() {
+  $ret = array();
+
+  if ($GLOBALS['db_type'] == 'mysql') {
+    $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') {
+    $ret[] = update_sql("ALTER TABLE {boxes} DROP CONSTRAINT {boxes}_title_key");
+  }
+
+  return $ret;
+}
+
+function system_update_132() {
+  /**
+   * PostgreSQL only update.
+   */
+  $ret = array();
+
+  if (!variable_get('update_132_done', FALSE)) {
+    if ($GLOBALS['db_type'] == 'pgsql') {
+      $ret[] = update_sql('DROP TABLE {search_total}');
+      $ret[] = update_sql("CREATE TABLE {search_total} (
+        word varchar(50) NOT NULL default '',
+             count float default NULL)");
+      $ret[] = update_sql('CREATE INDEX {search_total}_word_idx ON {search_total}(word)');
+
+      /**
+       * Wipe the search index
+       */
+      include_once './modules/search.module';
+      search_wipe();
+    }
+
+    variable_del('update_132_done');
+  }
+
+  return $ret;
+}
+
+function system_update_133() {
+  $ret = array();
+
+  if ($GLOBALS['db_type'] == 'mysql') {
+    $ret[] = update_sql("CREATE TABLE {contact} (
+      subject varchar(255) NOT NULL default '',
+      recipients longtext NOT NULL default '',
+      reply longtext NOT NULL default ''
+      )");
+    $ret[] = update_sql("ALTER TABLE {users} ADD login int(11) NOT NULL default '0'");
+  }
+  elseif ($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.
+
+    db_add_column($ret, 'users', 'login', 'int', array('default' => 0, 'not null' => TRUE));
+  }
+
+  return $ret;
+}
+
+function system_update_134() {
+  $ret = array();
+  $ret[] = update_sql('ALTER TABLE {blocks} DROP types');
+  return $ret;
+}
+
+function system_update_135() {
+  if (!variable_get('update_135_done', FALSE)) {
+    $result = db_query("SELECT delta FROM {blocks} WHERE module = 'aggregator'");
+    while ($block = db_fetch_object($result)) {
+      list($type, $id) = explode(':', $block->delta);
+      db_query("UPDATE {blocks} SET delta = '%s' WHERE module = 'aggregator' AND delta = '%s'", $type .'-'. $id, $block->delta);
+    }
+
+    variable_del('update_135_done');
+  }
+  return array();
+}
+
+function system_update_136() {
+  $ret = array();
+
+  switch ($GLOBALS['db_type']) {
+    case 'pgsql':
+      $ret[] = update_sql("DROP INDEX {users}_changed_idx"); // We drop the index first because it won't be renamed
+      $ret[] = update_sql("ALTER TABLE {users} RENAME changed TO access");
+      $ret[] = update_sql("CREATE INDEX {users}_access_idx on {users}(access)"); // Re-add the index
+      break;
+    case 'mysql':
+    case 'mysqli':
+      $ret[] = update_sql("ALTER TABLE {users} CHANGE COLUMN changed access int(11) NOT NULL default '0'");
+      break;
+  }
+
+  $ret[] = update_sql('UPDATE {users} SET access = login WHERE login > created');
+  $ret[] = update_sql('UPDATE {users} SET access = created WHERE access = 0');
+  return $ret;
+}
+
+function system_update_137() {
+  $ret = array();
+
+  if (!variable_get('update_137_done', FALSE)) {
+    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') {
+      db_change_column($ret, 'locales_source', 'location', 'location', 'varchar(255)', array('not null' => TRUE, 'default' => "''"));
+    }
+    variable_del('update_137_done');
+  }
+
+  return $ret;
+}
+
+function system_update_138() {
+  $ret = array();
+  // duplicate of update_97 which never got into the default database.* files.
+  $ret[] = update_sql("INSERT INTO {url_alias} (src, dst) VALUES ('node/feed', 'rss.xml')");
+  return $ret;
+}
+
+function system_update_139() {
+  $ret = array();
+  switch ($GLOBALS['db_type']) {
+    case 'pgsql':
+      db_add_column($ret, 'accesslog', 'timer', 'int', array('not null' => TRUE, 'default' => 0));
+      break;
+    case 'mysql':
+    case 'mysqli':
+      $ret[] = update_sql("ALTER TABLE {accesslog} ADD timer int(10) unsigned NOT NULL default '0'");
+      break;
+  }
+
+  return $ret;
+}
+
+function system_update_140() {
+  $ret = array();
+
+  if ($GLOBALS['db_type'] == 'mysql') {
+    $ret[] = update_sql("ALTER TABLE {url_alias} ADD INDEX (src)");
+  }
+  elseif ($GLOBALS['db_type'] == 'pgsql') {
+    $ret[] = update_sql("CREATE INDEX {url_alias}_src_idx ON {url_alias}(src)");
+  }
+  return $ret;
+}
+
+function system_update_141() {
+  $ret = array();
+
+  variable_del('upload_maxsize_total');
+
+  return $ret;
+}
+
+function system_update_142() {
+  $ret = array();
+
+  // This update has been moved to update_fix_sessions in update.php because it
+  // is needed for the basic functioning of the update script.
+
+  return $ret;
+}
+
+function system_update_143() {
+  $ret = array();
+
+  if ($GLOBALS['db_type'] == 'mysql') {
+    $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') {
+    // Why the table is created here? See update_133().
+    $ret[] = update_sql("CREATE TABLE {contact} (
+      category varchar(255) NOT NULL default '',
+      recipients text NOT NULL default '',
+      reply text NOT NULL default '',
+      PRIMARY KEY (category))");
+  }
+
+  return $ret;
+}
+
+function system_update_144() {
+  $ret = array();
+  if ($GLOBALS['db_type'] == 'mysql') {
+    $ret[] = update_sql("ALTER TABLE {node} CHANGE type type VARCHAR(32) NOT NULL");
+  }
+  elseif ($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' => "''"));
+    // Let's recreate the indexes
+    $ret[] = update_sql("CREATE INDEX {node}_type_idx ON {node}(type)");
+    $ret[] = update_sql("CREATE INDEX {node}_title_type_idx ON {node}(title,type)");
+    $ret[] = update_sql("CREATE INDEX {node}_status_type_nid_idx ON {node}(status,type,nid)");
+  }
+  return $ret;
+}
+
+function system_update_145() {
+  $default_theme = variable_get('theme_default', 'bluemarine');
+
+  $themes = list_themes();
+  if (!array_key_exists($default_theme, $themes)) {
+      variable_set('theme_default', 'bluemarine');
+      $default_theme = 'bluemarine';
+   }
+
+  $ret = array();
+
+  switch ($GLOBALS['db_type']) {
+    case 'pgsql':
+      db_change_column($ret, 'blocks', 'region', 'region', 'varchar(64)', array('default' => "'left'", 'not null' => TRUE));
+      db_add_column($ret, 'blocks', 'theme', 'varchar(255)', array('not null' => TRUE, 'default' => "''"));
+      break;
+    case 'mysql':
+    case 'mysqli':
+      $ret[] = update_sql("ALTER TABLE {blocks} CHANGE region region varchar(64) default 'left' NOT NULL");
+      $ret[] = update_sql("ALTER TABLE {blocks} ADD theme varchar(255) NOT NULL default ''");
+      break;
+  }
+
+  // Intialize block data for default theme
+  $ret[] = update_sql("UPDATE {blocks} SET region = 'left' WHERE region = '0'");
+  $ret[] = update_sql("UPDATE {blocks} SET region = 'right' WHERE region = '1'");
+  db_query("UPDATE {blocks} SET theme = '%s'", $default_theme);
+
+  // Initialze block data for other enabled themes.
+  $themes = list_themes();
+  foreach (array_keys($themes) as $theme) {
+    if (($theme != $default_theme) && $themes[$theme]->status == 1) {
+      system_initialize_theme_blocks($theme);
+    }
+  }
+
+  return $ret;
+}
+
+function system_update_146() {
+  $ret = array();
+
+  if ($GLOBALS['db_type'] == 'mysql') {
+    $ret[] = update_sql("CREATE TABLE {node_revisions}
+                                SELECT nid, nid AS vid, uid, type, title, body, teaser, changed AS timestamp, format
+                                FROM {node}");
+
+    $ret[] = update_sql("ALTER TABLE {node_revisions} CHANGE nid nid int(10) unsigned NOT NULL default '0'");
+    $ret[] = update_sql("ALTER TABLE {node_revisions} ADD log longtext");
+
+    $ret[] = update_sql("ALTER TABLE {node} ADD vid int(10) unsigned NOT NULL default '0'");
+    $ret[] = update_sql("ALTER TABLE {files} ADD vid int(10) unsigned NOT NULL default '0'");
+    $ret[] = update_sql("ALTER TABLE {book} ADD vid int(10) unsigned NOT NULL default '0'");
+    $ret[] = update_sql("ALTER TABLE {forum} ADD vid int(10) unsigned NOT NULL default '0'");
+
+    $ret[] = update_sql("ALTER TABLE {book} DROP PRIMARY KEY");
+    $ret[] = update_sql("ALTER TABLE {forum} DROP PRIMARY KEY");
+    $ret[] = update_sql("ALTER TABLE {files} DROP PRIMARY KEY");
+
+    $ret[] = update_sql("UPDATE {node} SET vid = nid");
+    $ret[] = update_sql("UPDATE {forum} SET vid = nid");
+    $ret[] = update_sql("UPDATE {book} SET vid = nid");
+    $ret[] = update_sql("UPDATE {files} SET vid = nid");
+
+    $ret[] = update_sql("ALTER TABLE {book} ADD PRIMARY KEY vid (vid)");
+    $ret[] = update_sql("ALTER TABLE {forum} ADD PRIMARY KEY vid (vid)");
+    $ret[] = update_sql("ALTER TABLE {node_revisions} ADD PRIMARY KEY vid (vid)");
+    $ret[] = update_sql("ALTER TABLE {node_revisions} ADD KEY nid (nid)");
+    $ret[] = update_sql("ALTER TABLE {node_revisions} ADD KEY uid (uid)");
+
+    $ret[] = update_sql("CREATE TABLE {old_revisions} SELECT nid, type, revisions FROM {node} WHERE revisions != ''");
+
+    $ret[] = update_sql("ALTER TABLE {book} ADD KEY nid (nid)");
+    $ret[] = update_sql("ALTER TABLE {forum} ADD KEY nid (nid)");
+    $ret[] = update_sql("ALTER TABLE {files} ADD KEY fid (fid)");
+    $ret[] = update_sql("ALTER TABLE {files} ADD KEY vid (vid)");
+    $vid = db_next_id('{node}_nid');
+    $ret[] = update_sql("INSERT INTO {sequences} (name, id) VALUES ('{node_revisions}_vid', $vid)");
+  }
+  else { // pgsql
+    $ret[] = update_sql("CREATE TABLE {node_revisions} (
+      nid integer NOT NULL default '0',
+      vid integer NOT NULL default '0',
+      uid integer NOT NULL default '0',
+      title varchar(128) NOT NULL default '',
+      body text NOT NULL default '',
+      teaser text NOT NULL default '',
+      log text NOT NULL default '',
+      timestamp integer NOT NULL default '0',
+      format int NOT NULL default '0',
+      PRIMARY KEY (vid))");
+    $ret[] = update_sql("INSERT INTO {node_revisions} (nid, vid, uid, title, body, teaser, timestamp, format)
+      SELECT nid, nid AS vid, uid, title, body, teaser, changed AS timestamp, format
+      FROM {node}");
+    $ret[] = update_sql('CREATE INDEX {node_revisions}_nid_idx ON {node_revisions}(nid)');
+    $ret[] = update_sql('CREATE INDEX {node_revisions}_uid_idx ON {node_revisions}(uid)');
+    $vid = db_next_id('{node}_nid');
+    $ret[] = update_sql("CREATE SEQUENCE {node_revisions}_vid_seq INCREMENT 1 START $vid");
+
+    db_add_column($ret, 'node',  'vid', 'int', array('not null' => TRUE, 'default' => 0));
+    db_add_column($ret, 'files', 'vid', 'int', array('not null' => TRUE, 'default' => 0));
+    db_add_column($ret, 'book',  'vid', 'int', array('not null' => TRUE, 'default' => 0));
+    db_add_column($ret, 'forum', 'vid', 'int', array('not null' => TRUE, 'default' => 0));
+
+    $ret[] = update_sql("ALTER TABLE {book} DROP CONSTRAINT {book}_pkey");
+    $ret[] = update_sql("ALTER TABLE {forum} DROP CONSTRAINT {forum}_pkey");
+    $ret[] = update_sql("ALTER TABLE {files} DROP CONSTRAINT {files}_pkey");
+
+    $ret[] = update_sql("UPDATE {node} SET vid = nid");
+    $ret[] = update_sql("UPDATE {forum} SET vid = nid");
+    $ret[] = update_sql("UPDATE {book} SET vid = nid");
+    $ret[] = update_sql("UPDATE {files} SET vid = nid");
+
+    $ret[] = update_sql("ALTER TABLE {book} ADD PRIMARY KEY (vid)");
+    $ret[] = update_sql("ALTER TABLE {forum} ADD PRIMARY KEY (vid)");
+
+    $ret[] = update_sql("CREATE TABLE {old_revisions} AS SELECT nid, type, revisions FROM {node} WHERE revisions != ''");
+
+    $ret[] = update_sql('CREATE INDEX {node}_vid_idx ON {node}(vid)');
+    $ret[] = update_sql('CREATE INDEX {forum}_nid_idx ON {forum}(nid)');
+    $ret[] = update_sql('CREATE INDEX {files}_fid_idx ON {files}(fid)');
+    $ret[] = update_sql('CREATE INDEX {files}_vid_idx ON {files}(vid)');
+  }
+
+  // Move logs too.
+  $result = db_query("SELECT nid, log FROM {book} WHERE log != ''");
+  while ($row = db_fetch_object($result)) {
+    db_query("UPDATE {node_revisions} SET log = '%s' WHERE vid = %d", $row->log, $row->nid);
+  }
+
+  $ret[] = update_sql("ALTER TABLE {book} DROP log");
+  $ret[] = update_sql("ALTER TABLE {node} DROP teaser");
+  $ret[] = update_sql("ALTER TABLE {node} DROP body");
+  $ret[] = update_sql("ALTER TABLE {node} DROP format");
+  $ret[] = update_sql("ALTER TABLE {node} DROP revisions");
+
+  return $ret;
+}
+
+function system_update_147() {
+  $ret = array();
+
+  // this update is mysql only, pgsql should get it right in the first try.
+  if ($GLOBALS['db_type'] == 'mysql') {
+    $ret[] = update_sql("ALTER TABLE {node_revisions} DROP type");
+  }
+
+  return $ret;
+}
+
+function system_update_148() {
+  $ret = array();
+
+  // Add support for tracking users' session ids (useful for tracking anon users)
+  switch ($GLOBALS['db_type']) {
+    case 'pgsql':
+      db_add_column($ret, 'accesslog', 'sid', 'varchar(32)', array('not null' => TRUE, 'default' => "''"));
+      break;
+    case 'mysql':
+    case 'mysqli':
+      $ret[] = update_sql("ALTER TABLE {accesslog} ADD sid varchar(32) NOT NULL default ''");
+      break;
+  }
+
+  return $ret;
+}
+
+function system_update_149() {
+  $ret = array();
+
+  switch ($GLOBALS['db_type']) {
+    case 'pgsql':
+      db_add_column($ret, 'files', 'description', 'varchar(255)', array('not null' => TRUE, 'default' => "''"));
+      break;
+    case 'mysql':
+    case 'mysqli':
+      $ret[] = update_sql("ALTER TABLE {files} ADD COLUMN description VARCHAR(255) NOT NULL DEFAULT ''");
+      break;
+    default:
+      break;
+  }
+
+  return $ret;
+}
+
+function system_update_150() {
+  $ret = array();
+
+  $ret[] = update_sql("DELETE FROM {variable} WHERE name = 'node_cron_last'");
+  $ret[] = update_sql("DELETE FROM {variable} WHERE name = 'minimum_word_size'");
+  $ret[] = update_sql("DELETE FROM {variable} WHERE name = 'remove_short'");
+
+  $ret[] = update_sql("DELETE FROM {node_counter} WHERE nid = 0");
+
+  $ret[] = update_sql('DROP TABLE {search_index}');
+  $ret[] = update_sql('DROP TABLE {search_total}');
+
+  switch ($GLOBALS['db_type']) {
+    case 'mysqli':
+    case 'mysql':
+      $ret[] = update_sql("CREATE TABLE {search_dataset} (
+                           sid int(10) unsigned NOT NULL default '0',
+                           type varchar(16) default NULL,
+                           data longtext NOT NULL,
+                           KEY sid_type (sid, type)
+                           )");
+
+      $ret[] = update_sql("CREATE TABLE {search_index} (
+                           word varchar(50) NOT NULL default '',
+                           sid int(10) unsigned NOT NULL default '0',
+                           type varchar(16) default NULL,
+                           fromsid int(10) unsigned NOT NULL default '0',
+                           fromtype varchar(16) default NULL,
+                           score float default NULL,
+                           KEY sid_type (sid, type),
+                           KEY from_sid_type (fromsid, fromtype),
+                           KEY word (word)
+                           )");
+
+      $ret[] = update_sql("CREATE TABLE {search_total} (
+                           word varchar(50) NOT NULL default '',
+                           count float default NULL,
+                           PRIMARY KEY word (word)
+                           )");
+      break;
+    case 'pgsql':
+      $ret[] = update_sql("CREATE TABLE {search_dataset} (
+        sid integer NOT NULL default '0',
+        type varchar(16) default NULL,
+        data text NOT NULL default '')");
+      $ret[] = update_sql("CREATE INDEX {search_dataset}_sid_type_idx ON {search_dataset}(sid, type)");
+
+      $ret[] = update_sql("CREATE TABLE {search_index} (
+        word varchar(50) NOT NULL default '',
+        sid integer NOT NULL default '0',
+        type varchar(16) default NULL,
+        fromsid integer NOT NULL default '0',
+        fromtype varchar(16) default NULL,
+        score float default NULL)");
+      $ret[] = update_sql("CREATE INDEX {search_index}_sid_type_idx ON {search_index}(sid, type)");
+      $ret[] = update_sql("CREATE INDEX {search_index}_fromsid_fromtype_idx ON {search_index}(fromsid, fromtype)");
+      $ret[] = update_sql("CREATE INDEX {search_index}_word_idx ON {search_index}(word)");
+
+      $ret[] = update_sql("CREATE TABLE {search_total} (
+        word varchar(50) NOT NULL default '',
+        count float default NULL,
+        PRIMARY KEY(word))");
+      break;
+    default:
+      break;
+  }
+  return $ret;
+}
+
+function system_update_151() {
+  $ret = array();
+
+  $ts = variable_get('theme_settings', NULL);
+
+  // set up data array so we can loop over both sets of links
+  $menus = array(0 => array('links_var' => 'primary_links',
+                            'toggle_var' => 'toggle_primary_links',
+                            'more_var' => 'primary_links_more',
+                            'menu_name' => 'Primary links',
+                            'menu_var' => 'menu_primary_menu',
+                            'pid' => 0),
+                 1 => array('links_var' => 'secondary_links',
+                            'toggle_var' => 'toggle_secondary_links',
+                            'more_var' => 'secondary_links_more',
+                            'menu_name' => 'Secondary links',
+                            'menu_var' => 'menu_secondary_menu',
+                            'pid' => 0));
+
+  for ($loop = 0; $loop <= 1 ; $loop ++) {
+    // create new Primary and Secondary links menus
+    $menus[$loop]['pid'] = db_next_id('{menu}_mid');
+    $ret[] = update_sql("INSERT INTO {menu} (mid, pid, path, title, description, weight, type) " .
+                         "VALUES ({$menus[$loop]['pid']}, 0, '', '{$menus[$loop]['menu_name']}', '', 0, 115)");
+
+    // Gather links from various settings into a single array.
+    $phptemplate_links = variable_get("phptemplate_". $menus[$loop]['links_var'], array());
+    if (empty($phptemplate_links)) {
+      $phptemplate_links = array('text' => array(), 'link' => array());
+    }
+    if (isset($ts) && is_array($ts)) {
+      if (is_array($ts[$menus[$loop]['links_var']])) {
+        $theme_links = $ts[$menus[$loop]['links_var']];
+      }
+      else {
+        // Convert old xtemplate style links.
+        preg_match_all('/<a\s+.*?href=[\"\'\s]?(.*?)[\"\'\s]?>(.*?)<\/a>/i', $ts[$menus[$loop]['links_var']], $urls);
+        $theme_links['text'] = $urls[2];
+        $theme_links['link'] = $urls[1];
+      }
+    }
+    else {
+      $theme_links = array('text' => array(), 'link' => array());
+    }
+    $links['text'] = array_merge($phptemplate_links['text'], $theme_links['text']);
+    $links['link'] = array_merge($phptemplate_links['link'], $theme_links['link']);
+
+    // insert all entries from theme links into new menus
+    $num_inserted = 0;
+    for ($i = 0; $i < count($links['text']); $i++) {
+      if ($links['text'][$i] != "" && $links['link'][$i] != "") {
+        $num_inserted ++;
+        $node_unalias = db_fetch_array(db_query("SELECT src FROM {url_alias} WHERE dst = '%s'", $links['link'][$i]));
+        if (isset($node_unalias) && is_array($node_unalias)) {
+          $link_path = $node_unalias['src'];
+        }
+        else {
+          $link_path = $links['link'][$i];
+        }
+
+        $mid = db_next_id('{menu}_mid');
+        $ret[] = update_sql("INSERT INTO {menu} (mid, pid, path, title, description, weight, type) " .
+                             "VALUES ($mid, {$menus[$loop]['pid']}, '" . db_escape_string($link_path) .
+                             "', '" . db_escape_string($links['text'][$i]) .
+                             "', '" . db_escape_string($links['description'][$i]) . "', 0, 118)");
+      }
+    }
+    // delete Secondary links if not populated.
+    if ($loop == 1 && $num_inserted == 0) {
+      db_query("DELETE FROM {menu} WHERE mid={$menus[$loop]['pid']}");
+    }
+
+    // Set menu_primary_menu and menu_primary_menu variables if links were
+    // imported. If the user had links but the toggle display was off, they
+    // will need to disable the new links manually in admins/settings/menu.
+    if ($num_inserted == 0) {
+      variable_set($menus[$loop]['menu_var'], 0);
+    }
+    else {
+      variable_set($menus[$loop]['menu_var'], $menus[$loop]['pid']);
+    }
+    variable_del('phptemplate_' .$menus[$loop]['links_var']);
+    variable_del('phptemplate_'. $menus[$loop]['links_var'] .'_more');
+    variable_del($menus[$loop]['toggle_var']);
+    variable_del($menus[$loop]['more_var']);
+    // If user has old xtemplate links in a string, leave them in the var.
+    if (isset($ts) && is_array($ts) && is_array($ts[$menus[$loop]['links_var']])) {
+      variable_del($menus[$loop]['links_var']);
+    }
+  }
+
+  if (isset($ts) && is_array($ts)) {
+    variable_set('theme_settings', $ts);
+  }
+
+  $ret[] = update_sql("UPDATE {system} SET status = 1 WHERE name = 'menu'");
+
+  return $ret;
+}
+
+function system_update_152() {
+  $ret = array();
+
+  // Postgresql only update
+  switch ($GLOBALS['db_type']) {
+    case 'pgsql':
+      $ret[] = update_sql("ALTER TABLE {forum} DROP shadow");
+      break;
+    case 'mysql':
+    case 'mysqli':
+      break;
+  }
+
+  return $ret;
+}
+
+function system_update_153(){
+  $ret = array();
+  switch ($GLOBALS['db_type']) {
+    case 'pgsql':
+      $ret[] = update_sql("ALTER TABLE {contact} DROP CONSTRAINT {contact}_pkey");
+      $ret[] = update_sql("CREATE SEQUENCE {contact}_cid_seq");
+      db_add_column($ret, 'contact', 'cid', 'int', array('not null' => TRUE, 'default' => "nextval('{contact}_cid_seq')"));
+      $ret[] = update_sql("ALTER TABLE {contact} ADD PRIMARY KEY (cid)");
+      $ret[] = update_sql("ALTER TABLE {contact} ADD CONSTRAINT {contact}_category_key UNIQUE (category)");
+      break;
+    case 'mysql':
+    case 'mysqli':
+      $ret[] = update_sql("ALTER TABLE {contact} DROP PRIMARY KEY");
+      $ret[] = update_sql("ALTER TABLE {contact} ADD COLUMN cid int(11) NOT NULL PRIMARY KEY auto_increment");
+      $ret[] = update_sql("ALTER TABLE {contact} ADD UNIQUE KEY category (category)");
+      break;
+  }
+  return $ret;
+}
+
+function system_update_154() {
+  $ret = array();
+  switch ($GLOBALS['db_type']) {
+    case 'pgsql':
+      db_add_column($ret, 'contact', 'weight', 'smallint', array('not null' => TRUE, 'default' => 0));
+      db_add_column($ret, 'contact', 'selected', 'smallint', array('not null' => TRUE, 'default' => 0));
+      break;
+    case 'mysql':
+    case 'mysqli':
+      $ret[] = update_sql("ALTER TABLE {contact} ADD COLUMN weight tinyint(3) NOT NULL DEFAULT 0");
+      $ret[] = update_sql("ALTER TABLE {contact} ADD COLUMN selected tinyint(1) NOT NULL DEFAULT 0");
+      break;
+  }
+  return $ret;
+}
+
+function system_update_155() {
+  $ret = array();
+
+  // Postgresql only update
+  switch ($GLOBALS['db_type']) {
+    case 'pgsql':
+      $ret[] = update_sql("DROP TABLE {cache}");
+      $ret[] = update_sql("CREATE TABLE {cache} (
+        cid varchar(255) NOT NULL default '',
+        data bytea default '',
+        expire integer NOT NULL default '0',
+        created integer NOT NULL default '0',
+        headers text default '',
+        PRIMARY KEY (cid)
+        )");
+      $ret[] = update_sql("CREATE INDEX {cache}_expire_idx ON {cache}(expire)");
+      break;
+    case 'mysql':
+    case 'mysqli':
+      break;
+  }
+
+  return $ret;
+}
+
+function system_update_156() {
+  $ret = array();
+  $ret[] = update_sql("DELETE FROM {cache}");
+  system_themes();
+  return $ret;
+}
+
+function system_update_157() {
+  $ret = array();
+  $ret[] = update_sql("DELETE FROM {url_alias} WHERE src = 'node/feed' AND dst = 'rss.xml'");
+  $ret[] = update_sql("INSERT INTO {url_alias} (src, dst) VALUES ('rss.xml', 'node/feed')");
+  return $ret;
+}
+
+function system_update_158() {
+  $ret = array();
+
+  switch ($GLOBALS['db_type']) {
+    case 'mysqli':
+    case 'mysql':
+      $ret[] = update_sql("ALTER TABLE {old_revisions} ADD done tinyint(1) NOT NULL DEFAULT 0");
+      $ret[] = update_sql("ALTER TABLE {old_revisions} ADD INDEX (done)");
+      break;
+
+    case 'pgsql':
+      db_add_column($ret, 'old_revisions', 'done', 'smallint', array('not null' => TRUE, 'default' => 0));
+      $ret[] = update_sql('CREATE INDEX {old_revisions}_done_idx ON {old_revisions}(done)');
+      break;
+  }
+
+  return $ret;
+}
+
+/**
+ * Retrieve data out of the old_revisions table and put into new revision
+ * system.
+ *
+ * The old_revisions table is not deleted because any data which could not be
+ * put into the new system is retained.
+ */
+function system_update_159() {
+  $ret = array();
+
+  $result = db_query_range("SELECT * FROM {old_revisions} WHERE done = 0 AND type IN ('page', 'story', 'poll', 'book', 'forum', 'blog') ORDER BY nid DESC", 0, 20);
+
+  if (db_num_rows($result)) {
+    $vid = db_next_id('{node_revisions}_vid');
+    while ($node = db_fetch_object($result)) {
+      $revisions = unserialize($node->revisions);
+      if (isset($revisions) && is_array($revisions) && count($revisions) > 0) {
+        $revisions_query = array();
+        $revisions_args = array();
+        $book_query = array();
+        $book_args = array();
+        $forum_query = array();
+        $forum_args = array();
+        foreach ($revisions as $version) {
+          $revision = array();
+          foreach ($version['node'] as $node_field => $node_value) {
+            $revision[$node_field] = $node_value;
+          }
+          $revision['uid'] = $version['uid'];
+          $revision['timestamp'] = $version['timestamp'];
+          $vid++;
+          $revisions_query[] = "(%d, %d, %d, '%s', '%s', '%s', '%s', %d, %d)";
+          $revisions_args = array_merge($revisions_args, array($node->nid, $vid, $revision['uid'], $revision['title'], $revision['body'], $revision['teaser'], $revision['log'], $revision['timestamp'], $revision['format']));
+          switch ($node->type) {
+            case 'forum':
+              if ($revision['tid'] > 0) {
+                $forum_query[] = "(%d, %d, %d)";
+                $forum_args = array_merge($forum_args, array($vid, $node->nid, $revision['tid']));
+              }
+              break;
+
+            case 'book':
+              $book_query[] = "(%d, %d, %d, %d)";
+              $book_args = array_merge($book_args, array($vid, $node->nid, $revision['parent'], $revision['weight']));
+              break;
+          }
+        }
+        if (count($revisions_query)) {
+          $revision_status = db_query("INSERT INTO {node_revisions} (nid, vid, uid, title, body, teaser, log, timestamp, format) VALUES ". implode(',', $revisions_query), $revisions_args);
+        }
+        if (count($forum_query)) {
+          $forum_status = db_query("INSERT INTO {forum} (vid, nid, tid) VALUES ". implode(',', $forum_query), $forum_args);
+        }
+        if (count($book_query)) {
+          $book_status = db_query("INSERT INTO {book} (vid, nid, parent, weight) VALUES ". implode(',', $book_query), $book_args);
+        }
+        $delete = FALSE;
+        switch ($node->type) {
+          case 'forum':
+            if ($forum_status && $revision_status) {
+              $delete = TRUE;
+            }
+            break;
+
+          case 'book':
+            if ($book_status && $revision_status) {
+              $delete = TRUE;
+            }
+            break;
+
+          default:
+            if ($revision_status) {
+              $delete = TRUE;
+            }
+            break;
+        }
+
+        if ($delete) {
+          db_query('DELETE FROM {old_revisions} WHERE nid = %d', $node->nid);
+        }
+        else {
+          db_query('UPDATE {old_revisions} SET done = 1 WHERE nid = %d', $node->nid);
+        }
+
+        switch ($GLOBALS['db_type']) {
+          case 'mysqli':
+          case 'mysql':
+            $ret[] = update_sql("UPDATE {sequences} SET id = $vid WHERE name = '{node_revisions}_vid'");
+            break;
+
+          case 'pgsql':
+            $ret[] = update_sql("SELECT setval('{node_revisions}_vid_seq', $vid)");
+            break;
+        }
+      }
+      else {
+        db_query('UPDATE {old_revisions} SET done = 1 WHERE nid = %d', $node->nid);
+        watchdog('php', "Recovering old revisions for node $node->nid failed.", WATCHDOG_WARNING);
+      }
+    }
+  }
+
+  if (db_num_rows($result) < 20) {
+    $ret[] = update_sql('ALTER TABLE {old_revisions} DROP done');
+  }
+  else {
+    $ret['#finished'] = FALSE;
+  }
+
+  return $ret;
+}
+
+function system_update_160() {
+  $types = module_invoke('node', 'get_types');
+  if (is_array($types)) {
+    foreach($types as $type) {
+      if (!is_array(variable_get("node_options_$type", array()))) {
+        variable_set("node_options_$type", array());
+      }
+    }
+  }
+  return array();
+}
+
+function system_update_161() {
+  variable_del('forum_icon_path');
+  return array();
+}
+
+function system_update_162() {
+  $ret = array();
+
+  // PostgreSQL only update
+  switch ($GLOBALS['db_type']) {
+    case 'pgsql':
+
+      $ret[] = update_sql('DROP INDEX {book}_parent');
+      $ret[] = update_sql('CREATE INDEX {book}_parent_idx ON {book}(parent)');
+
+      $ret[] = update_sql('DROP INDEX {node_comment_statistics}_timestamp_idx');
+      $ret[] = update_sql('CREATE INDEX {node_comment_statistics}_last_comment_timestamp_idx ON {node_comment_statistics}(last_comment_timestamp)');
+
+      $ret[] = update_sql('ALTER TABLE {filters} ALTER delta SET DEFAULT 0');
+      $ret[] = update_sql('DROP INDEX {filters}_module_idx');
+
+      $ret[] = update_sql('DROP INDEX {locales_target}_lid_idx');
+      $ret[] = update_sql('DROP INDEX {locales_target}_lang_idx');
+      $ret[] = update_sql('CREATE INDEX {locales_target}_locale_idx ON {locales_target}(locale)');
+
+      $ret[] = update_sql('DROP INDEX {node}_created');
+      $ret[] = update_sql('CREATE INDEX {node}_created_idx ON {node}(created)');
+      $ret[] = update_sql('DROP INDEX {node}_changed');
+      $ret[] = update_sql('CREATE INDEX {node}_changed_idx ON {node}(changed)');
+
+      $ret[] = update_sql('DROP INDEX {profile_fields}_category');
+      $ret[] = update_sql('CREATE INDEX {profile_fields}_category_idx ON {profile_fields}(category)');
+
+      $ret[] = update_sql('DROP INDEX {url_alias}_dst_idx');
+      $ret[] = update_sql('CREATE UNIQUE INDEX {url_alias}_dst_idx ON {url_alias}(dst)');
+
+      $ret[] = update_sql('CREATE INDEX {sessions}_uid_idx ON {sessions}(uid)');
+      $ret[] = update_sql('CREATE INDEX {sessions}_timestamp_idx ON {sessions}(timestamp)');
+
+      $ret[] = update_sql('ALTER TABLE {accesslog} DROP mask');
+
+      db_change_column($ret, 'accesslog', 'path', 'path', 'text');
+      db_change_column($ret, 'accesslog', 'url', 'url', 'text');
+      db_change_column($ret, 'watchdog', 'link', 'link', 'text', array('not null' => TRUE, 'default' => "''"));
+      db_change_column($ret, 'watchdog', 'location', 'location', 'text', array('not null' => TRUE, 'default' => "''"));
+      db_change_column($ret, 'watchdog', 'referer', 'referer', 'text', array('not null' => TRUE, 'default' => "''"));
+
+      break;
+  }
+
+  return $ret;
+}
+
+function system_update_163() {
+  $ret = array();
+  if ($GLOBALS['db_type'] == 'mysql' || $GLOBALS['db_type'] == 'mysqli') {
+    $ret[] = update_sql('ALTER TABLE {cache} CHANGE data data LONGBLOB');
+  }
+  return $ret;
+}
+
+function system_update_164() {
+  $ret = array();
+
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+      $ret[] = update_sql("CREATE TABLE {poll_votes} (
+          nid int(10) unsigned NOT NULL,
+          uid int(10) unsigned NOT NULL default 0,
+          hostname varchar(128) NOT NULL default '',
+          INDEX (nid),
+          INDEX (uid),
+          INDEX (hostname)
+      )");
+      break;
+
+    case 'pgsql':
+      $ret[] = update_sql("CREATE TABLE {poll_votes} (
+          nid int NOT NULL,
+          uid int NOT NULL default 0,
+          hostname varchar(128) NOT NULL default ''
+      )");
+      $ret[] = update_sql('CREATE INDEX {poll_votes}_nid_idx ON {poll_votes} (nid)');
+      $ret[] = update_sql('CREATE INDEX {poll_votes}_uid_idx ON {poll_votes} (uid)');
+      $ret[] = update_sql('CREATE INDEX {poll_votes}_hostname_idx ON {poll_votes} (hostname)');
+      break;
+  }
+
+  $result = db_query('SELECT nid, polled FROM {poll}');
+  while ($poll = db_fetch_object($result)) {
+    foreach (explode(' ', $poll->polled) as $polled) {
+      if ($polled[0] == '_') {
+        // $polled is a user id
+        db_query('INSERT INTO {poll_votes} (nid, uid) VALUES (%d, %d)', $poll->nid, substr($polled, 1, -1));
+      }
+      else {
+        // $polled is a host
+        db_query("INSERT INTO {poll_votes} (nid, hostname) VALUES (%d, '%s')", $poll->nid, $polled);
+      }
+    }
+  }
+
+  $ret[] = update_sql('ALTER TABLE {poll} DROP polled');
+
+  return $ret;
+}
+
+function system_update_165() {
+  $cron_last = max(variable_get('drupal_cron_last', 0), variable_get('ping_cron_last', 0));
+  variable_set('cron_last', $cron_last);
+  variable_del('drupal_cron_last');
+  variable_del('ping_cron_last');
+  return array();
+}
+
+function system_update_166() {
+  $ret = array();
+
+  $ret[] = update_sql("DROP TABLE {directory}");
+  switch ($GLOBALS['db_type']) {
+    case 'mysqli':
+    case 'mysql':
+      $ret[] = update_sql("CREATE TABLE {client} (
+        cid int(10) unsigned NOT NULL auto_increment,
+        link varchar(255) NOT NULL default '',
+        name varchar(128) NOT NULL default '',
+        mail varchar(128) NOT NULL default '',
+        slogan longtext NOT NULL,
+        mission longtext NOT NULL,
+        users int(10) NOT NULL default '0',
+        nodes int(10) NOT NULL default '0',
+        version varchar(35) NOT NULL default'',
+        created int(11) NOT NULL default '0',
+        changed int(11) NOT NULL default '0',
+        PRIMARY KEY (cid)
+      )");
+      $ret[] = update_sql("CREATE TABLE {client_system} (
+        cid int(10) NOT NULL default '0',
+        name varchar(255) NOT NULL default '',
+        type varchar(255) NOT NULL default '',
+        PRIMARY KEY (cid,name)
+      )");
+      break;
+
+    case 'pgsql':
+      $ret[] = update_sql("CREATE TABLE {client} (
+        cid SERIAL,
+        link varchar(255) NOT NULL default '',
+        name varchar(128) NOT NULL default '',
+        mail varchar(128) NOT NULL default '',
+        slogan text NOT NULL default '',
+        mission text NOT NULL default '',
+        users integer NOT NULL default '0',
+        nodes integer NOT NULL default '0',
+        version varchar(35) NOT NULL default'',
+        created integer NOT NULL default '0',
+        changed integer NOT NULL default '0',
+        PRIMARY KEY (cid)
+      )");
+      $ret[] = update_sql("CREATE TABLE {client_system} (
+        cid integer NOT NULL,
+        name varchar(255) NOT NULL default '',
+        type varchar(255) NOT NULL default '',
+        PRIMARY KEY (cid,name)
+      )");
+      break;
+  }
+
+  return $ret;
+}
+
+function system_update_167() {
+  $ret = array();
+
+  switch ($GLOBALS['db_type']) {
+    case 'mysqli':
+    case 'mysql':
+      $ret[] = update_sql("ALTER TABLE {vocabulary_node_types} CHANGE type type varchar(32) NOT NULL default ''");
+      break;
+    case 'pgsql':
+      db_change_column($ret, 'vocabulary_node_types', 'type', 'type', 'varchar(32)', array('not null' => TRUE, 'default' => "''"));
+      $ret[] = update_sql("ALTER TABLE {vocabulary_node_types} ADD PRIMARY KEY (vid, type)");
+      break;
+  }
+
+  return $ret;
+}
+
+function system_update_168() {
+  $ret = array();
+
+  $ret[] = update_sql("ALTER TABLE {term_hierarchy} ADD PRIMARY KEY (tid, parent)");
+
+  return $ret;
+}
+
+function system_update_169() {
+  // Warn PGSQL admins if their database is set up incorrectly
+  if ($GLOBALS['db_type'] == 'pgsql') {
+    $encoding = db_result(db_query('SHOW server_encoding'));
+    if (!in_array(strtolower($encoding), array('unicode', 'utf8'))) {
+      $msg = 'Your PostgreSQL database is set up with the wrong character encoding ('. $encoding .'). It is possible it will not work as expected. It is advised to recreate it with UTF-8/Unicode encoding. More information can be found in the <a href="http://www.postgresql.org/docs/7.4/interactive/multibyte.html">PostgreSQL documentation</a>.';
+      watchdog('php', $msg, WATCHDOG_WARNING);
+      drupal_set_message($msg, 'status');
+    }
+  }
+
+  // Note: 'access' table manually updated in update.php
+  return _system_update_utf8(array(
+    'accesslog', 'aggregator_category',
+    'aggregator_category_feed', 'aggregator_category_item',
+    'aggregator_feed', 'aggregator_item', 'authmap', 'blocks',
+    'book', 'boxes', 'cache', 'comments', 'contact',
+    'node_comment_statistics', 'client', 'client_system', 'files',
+    'filter_formats', 'filters', 'flood', 'forum', 'history',
+    'locales_meta', 'locales_source', 'locales_target', 'menu',
+    'node', 'node_access', 'node_revisions', 'profile_fields',
+    'profile_values', 'url_alias', 'permission', 'poll', 'poll_votes',
+    'poll_choices', 'role', 'search_dataset', 'search_index',
+    'search_total', 'sessions', 'sequences', 'node_counter',
+    'system', 'term_data', 'term_hierarchy', 'term_node',
+    'term_relation', 'term_synonym', 'users', 'users_roles', 'variable',
+    'vocabulary', 'vocabulary_node_types', 'watchdog'
+  ));
+}
+
+/**
+ * Converts a set of tables to UTF-8 encoding.
+ *
+ * This update is designed to be re-usable by contrib modules and is
+ * used by system_update_169().
+ */
+function _system_update_utf8($tables) {
+  // Are we starting this update for the first time?
+  if (!isset($_SESSION['update_utf8'])) {
+    switch ($GLOBALS['db_type']) {
+      // Only for MySQL 4.1+
+      case 'mysqli':
+        break;
+      case 'mysql':
+        if (version_compare(mysql_get_server_info($GLOBALS['active_db']), '4.1.0', '<')) {
+          return array();
+        }
+        break;
+      case 'pgsql':
+        return array();
+    }
+
+    // See if database uses UTF-8 already
+    global $db_url;
+    $url = parse_url(is_array($db_url) ? $db_url['default'] : $db_url);
+    $db_name = substr($url['path'], 1);
+    $result = db_fetch_array(db_query('SHOW CREATE DATABASE `%s`', $db_name));
+    if (preg_match('/utf8/i', array_pop($result))) {
+      return array();
+    }
+
+    // Make list of tables to convert
+    $_SESSION['update_utf8'] = $tables;
+    // Keep track of total for progress bar
+    $_SESSION['update_utf8_total'] = count($tables);
+  }
+
+  // Fetch remaining tables list and convert next table
+  $list = &$_SESSION['update_utf8'];
+
+  $ret = update_convert_table_utf8(array_shift($list));
+
+  // Are we done?
+  if (count($list) == 0) {
+    unset($_SESSION['update_utf8']);
+    unset($_SESSION['update_utf8_total']);
+    return $ret;
+  }
+
+  // Progress percentage
+  $ret['#finished'] = 1 - (count($list) / $_SESSION['update_utf8_total']);
+  return $ret;
+}
+
+function system_update_170() {
+  if (!variable_get('update_170_done', FALSE)) {
+    switch ($GLOBALS['db_type']) {
+      case 'pgsql':
+        $ret = array();
+        db_change_column($ret, 'system', 'schema_version', 'schema_version', 'smallint', array('not null' => TRUE, 'default' => -1));
+        break;
+
+      case 'mysql':
+      case 'mysqli':
+        db_query('ALTER TABLE {system} CHANGE schema_version schema_version smallint(3) not null default -1');
+        break;
+    }
+    // Set schema version -1 (uninstalled) for disabled modules (only affects contrib).
+    db_query('UPDATE {system} SET schema_version = -1 WHERE status = 0 AND schema_version = 0');
+  }
+  return array();
+}
+
+function system_update_171() {
+  $ret = array();
+  $ret[] = update_sql('DELETE FROM {users_roles} WHERE rid IN ('. DRUPAL_ANONYMOUS_RID. ', '. DRUPAL_AUTHENTICATED_RID. ')');
+  return $ret;
+}
+
+function system_update_172() {
+  // Multi-part update
+  if (!isset($_SESSION['system_update_172'])) {
+    $_SESSION['system_update_172'] = 0;
+    $_SESSION['system_update_172_max'] = db_result(db_query('SELECT MAX(cid) FROM {comments}'));
+  }
+
+  include_once './modules/comment.module';
+
+  $limit = 20;
+  $result = db_query_range("SELECT cid, thread FROM {comments} WHERE cid > %d ORDER BY cid ASC", $_SESSION['system_update_172'], 0, $limit);
+  while ($comment = db_fetch_object($result)) {
+    $_SESSION['system_update_172'] = $comment->cid;
+    $thread = explode('.', rtrim($comment->thread, '/'));
+    foreach ($thread as $i => $offset) {
+      // Decode old-style comment codes: 1,2,...,9,90,91,92,...,99,990,991,...
+      $thread[$i] = int2vancode((strlen($offset) - 1) * 10 + substr($offset, -1, 1));
+    }
+    $thread = implode('.', $thread) .'/';
+    db_query("UPDATE {comments} SET thread = '%s' WHERE cid = %d", $thread, $comment->cid);
+  }
+
+  if ($_SESSION['system_update_172'] == $_SESSION['system_update_172_max']) {
+    unset($_SESSION['system_update_172']);
+    unset($_SESSION['system_update_172_max']);
+    return array();
+  }
+  return array('#finished' => $_SESSION['system_update_172'] / $_SESSION['system_update_172_max']);
+}
+
+function system_update_173() {
+  $ret = array();
+  // State tracker to determine whether we keep a backup of the files table or not.
+  $safe = TRUE;
+
+  // PostgreSQL needs CREATE TABLE foobar _AS_ SELECT ...
+  $AS = ($GLOBALS['db_type'] == 'pgsql') ? 'AS' : '';
+
+  // Backup the files table.
+  $ret[] = update_sql("CREATE TABLE {files_backup} $AS SELECT * FROM {files}");
+
+  // Do some files table sanity checking and cleanup.
+  $ret[] = update_sql('DELETE FROM {files} WHERE fid = 0');
+  $ret[] = update_sql('UPDATE {files} SET vid = nid WHERE vid = 0');
+
+  // Create a temporary table to build the new file_revisions and files tables from.
+  $ret[] = update_sql("CREATE TABLE {files_tmp} $AS SELECT * FROM {files}");
+  $ret[] = update_sql('DROP TABLE {files}');
+
+  switch ($GLOBALS['db_type']) {
+    case 'pgsql':
+      // create file_revisions table
+      $ret[] = update_sql("CREATE TABLE {file_revisions} (
+        fid integer NOT NULL default 0,
+        vid integer NOT NULL default 0,
+        description varchar(255) NOT NULL default '',
+        list smallint NOT NULL default 0,
+        PRIMARY KEY (fid, vid))");
+      $result = update_sql("INSERT INTO {file_revisions} SELECT DISTINCT ON (fid,vid) fid, vid, description, list FROM {files_tmp}");
+      $ret[] = $result;
+      if ($result['success'] === FALSE) {
+        $safe = FALSE;
+      }
+
+      // Create normalized files table
+      $ret[] = update_sql("CREATE TABLE {files} (
+        fid SERIAL,
+        nid integer NOT NULL default 0,
+        filename varchar(255) NOT NULL default '',
+        filepath varchar(255) NOT NULL default '',
+        filemime varchar(255) NOT NULL default '',
+        filesize integer NOT NULL default 0,
+        PRIMARY KEY (fid))");
+      $result = update_sql("INSERT INTO {files} SELECT DISTINCT ON (fid) fid, nid, filename, filepath, filemime, filesize FROM {files_tmp}");
+      $ret[] = $result;
+      if ($result['success'] === FALSE) {
+        $safe = FALSE;
+      }
+
+      $ret[] = update_sql("SELECT setval('{files}_fid_seq', max(fid)) FROM {files}");
+
+      break;
+
+    case 'mysqli':
+    case 'mysql':
+      // create file_revisions table
+      $ret[] = update_sql("CREATE TABLE {file_revisions} (
+        fid int(10) unsigned NOT NULL default 0,
+        vid int(10) unsigned NOT NULL default 0,
+        description varchar(255) NOT NULL default '',
+        list tinyint(1) unsigned NOT NULL default 0,
+        PRIMARY KEY (fid, vid)
+        ) /*!40100 DEFAULT CHARACTER SET utf8 */");
+
+      // Try as you might mysql only does distinct row if you are selecting more than 1 column.
+      $result = update_sql('INSERT INTO {file_revisions} SELECT DISTINCT fid , vid, description, list FROM {files_tmp}');
+      $ret[] = $result;
+      if ($result['success'] === FALSE) {
+        $safe = FALSE;
+      }
+
+      $ret[] = update_sql("CREATE TABLE {files} (
+        fid int(10) unsigned NOT NULL default 0,
+        nid int(10) unsigned NOT NULL default 0,
+        filename varchar(255) NOT NULL default '',
+        filepath varchar(255) NOT NULL default '',
+        filemime varchar(255) NOT NULL default '',
+        filesize int(10) unsigned NOT NULL default 0,
+        PRIMARY KEY (fid)
+        ) /*!40100 DEFAULT CHARACTER SET utf8 */");
+      $result = update_sql("INSERT INTO {files} SELECT DISTINCT fid, nid, filename, filepath, filemime, filesize FROM {files_tmp}");
+      $ret[] = $result;
+      if ($result['success'] === FALSE) {
+        $safe = FALSE;
+      }
+
+      break;
+  }
+
+  $ret[] = update_sql("DROP TABLE {files_tmp}");
+
+  // Remove original files table if all went well. Otherwise preserve it and notify user.
+  if ($safe) {
+    $ret[] = update_sql("DROP TABLE {files_backup}");
+  }
+  else {
+    drupal_set_message('Normalizing files table failed. A backup of the original table called {files_backup} remains in your database.');
+  }
+
+  return $ret;
+}
+
+function system_update_174() {
+  // This update (update comments system variables on upgrade) has been removed.
+  return array();
+}
+
+function system_update_175() {
+  $result = db_query('SELECT * FROM {url_alias}');
+  while ($path = db_fetch_object($result)) {
+    $path->src = urldecode($path->src);
+    $path->dst = urldecode($path->dst);
+    db_query("UPDATE {url_alias} SET dst = '%s', src = '%s' WHERE pid = %d", $path->dst, $path->src, $path->pid);
+  }
+  return array();
+}
+
+function system_update_176() {
+  $ret = array();
+  $ret[] = update_sql('ALTER TABLE {filter_formats} ADD UNIQUE (name)');
+  return $ret;
+}
+
+function system_update_177() {
+  $ret = array();
+  $message_ids = array(
+    'welcome_subject' => 'Welcome subject',
+    'welcome_body' => 'Welcome body text',
+    'approval_subject' => 'Approval subject',
+    'approval_body' => 'Approval body text',
+    'pass_subject' => 'Password reset subject',
+    'pass_body' => 'Password reset body text',
+  );
+  foreach ($message_ids as $message_id => $message_text) {
+    if ($admin_setting = variable_get('user_mail_'. $message_id, FALSE)) {
+      // Insert newlines and escape for display as HTML
+      $admin_setting = nl2br(check_plain($message_text ."\n\n". $admin_setting));
+      watchdog('legacy', $admin_setting);
+      $last = db_fetch_object(db_query('SELECT max(wid) AS wid FROM {watchdog}'));
+      // Deleting is required, because _user_mail_text() checks for the existance of the variable.
+      variable_del('user_mail_'. $message_id);
+      $ret[] = array(
+        'query' => strtr('The mail template %message_id has been reset to the default. The old template <a href="%url">has been saved</a>.', array('%message_id' => 'user_mail_'. $message_id, '%url' => url('admin/logs/event/'. $last->wid))),
+        'success' => TRUE
+      );
+    }
+  }
+  return $ret;
+}
+
+function _update_178_url_fix($text) {
+  // Key is the attribute to replace.
+  $urlpatterns['href'] = "/<a[^>]+href=\"([^\"]+)/i";
+  $urlpatterns['src']  = "/<img[^>]+src=\"([^\"]+)/i";
+
+  $old = $text;
+  foreach ($urlpatterns as $type => $pattern) {
+    if (preg_match_all($pattern, $text, $matches)) {
+      foreach ($matches[1] as $url) {
+        if ($url != '' && !strstr($url, 'mailto:') && !strstr($url, '://') && !strstr($url, '../') && !strstr($url, './') && $url[0] != '/' && $url[0] != '#') {
+          $text = preg_replace('|'. $type .'\s*=\s*"'. preg_quote($url) .'\s*"|', $type. '="'.base_path(). $url  .'"', $text);
+        }
+      }
+    }
+  }
+  return $text != $old ? $text : FALSE;
+}
+
+function _update_178_url_formats() {
+  $formats = array();
+
+  // Any format with the HTML filter in it
+  $result = db_query("SELECT format FROM {filters} WHERE module = 'filter' AND delta = 0");
+  while ($format = db_fetch_object($result)) {
+    $formats[$format->format] = TRUE;
+  }
+
+  // Any format with only the linebreak filter in it
+  $result = db_query("SELECT format FROM {filters} WHERE module = 'filter' AND delta = 2");
+  while ($format = db_fetch_object($result)) {
+    if (db_result(db_query('SELECT COUNT(*) FROM {filters} WHERE format = %d', $format->format)) == 1) {
+      $formats[$format->format] = TRUE;
+    }
+  }
+
+  // Any format with 'HTML' in its name
+  $result = db_query("SELECT format FROM {filter_formats} WHERE name LIKE '%HTML%'");
+  while ($format = db_fetch_object($result)) {
+    $formats[$format->format] = TRUE;
+  }
+
+  return $formats;
+}
+
+/**
+ * Update base paths for relative URLs in node and comment content.
+ */
+function system_update_178() {
+
+  if (variable_get('clean_url', 0) == 1) {
+    // Multi-part update
+    if (!isset($_SESSION['system_update_178_comment'])) {
+      // Check which formats need to be converted
+      $formats = _update_178_url_formats();
+      if (count($formats) == 0) {
+        return array();
+      }
+
+      // Build format query string
+      $_SESSION['formats'] = array_keys($formats);
+      $_SESSION['format_string'] = '('. substr(str_repeat('%d, ', count($formats)), 0, -2) .')';
+
+      // Begin update
+      $_SESSION['system_update_178_comment'] = 0;
+      $_SESSION['system_update_178_node'] = 0;
+      $_SESSION['system_update_178_comment_max'] = db_result(db_query('SELECT MAX(cid) FROM {comments} WHERE format IN '. $_SESSION['format_string'], $_SESSION['formats']));
+      $_SESSION['system_update_178_node_max'] = db_result(db_query('SELECT MAX(vid) FROM {node_revisions} WHERE format IN '. $_SESSION['format_string'], $_SESSION['formats']));
+    }
+
+    $limit = 20;
+
+    // Comments
+    if ($_SESSION['system_update_178_comment'] != $_SESSION['system_update_178_comment_max']) {
+      $args = array_merge(array($_SESSION['system_update_178_comment']), $_SESSION['formats']);
+      $result = db_query_range("SELECT cid, comment FROM {comments} WHERE cid > %d AND format IN ". $_SESSION['format_string'] .' ORDER BY cid ASC', $args, 0, $limit);
+      while ($comment = db_fetch_object($result)) {
+        $_SESSION['system_update_178_comment'] = $comment->cid;
+        $comment->comment = _update_178_url_fix($comment->comment);
+        if ($comment->comment !== FALSE) {
+          db_query("UPDATE {comments} SET comment = '%s' WHERE cid = %d", $comment->comment, $comment->cid);
+        }
+      }
+    }
+
+    // Node revisions
+    $args = array_merge(array($_SESSION['system_update_178_node']), $_SESSION['formats']);
+    $result = db_query_range("SELECT vid, teaser, body FROM {node_revisions} WHERE vid > %d AND format IN ". $_SESSION['format_string'] .' ORDER BY vid ASC', $args, 0, $limit);
+    while ($node = db_fetch_object($result)) {
+      $_SESSION['system_update_178_node'] = $node->vid;
+      $set = array();
+      $args = array();
+
+      $node->teaser = _update_178_url_fix($node->teaser);
+      if ($node->teaser !== FALSE) {
+        $set[] = "teaser = '%s'";
+        $args[] = $node->teaser;
+      }
+
+      $node->body = _update_178_url_fix($node->body);
+      if ($node->body !== FALSE) {
+        $set[] = "body = '%s'";
+        $args[] = $node->body;
+      }
+
+      if (count($set)) {
+        $args[] = $node->vid;
+        db_query('UPDATE {node_revisions} SET '. implode(', ', $set) .' WHERE vid = %d', $args);
+      }
+
+    }
+
+    if ($_SESSION['system_update_178_comment'] == $_SESSION['system_update_178_comment_max'] &&
+        $_SESSION['system_update_178_node'] == $_SESSION['system_update_178_node_max']) {
+      unset($_SESSION['system_update_178_comment']);
+      unset($_SESSION['system_update_178_comment_max']);
+      unset($_SESSION['system_update_178_node']);
+      unset($_SESSION['system_update_178_node_max']);
+      return array();
+    }
+    else {
+      // Report percentage finished
+      return array('#finished' =>
+        ($_SESSION['system_update_178_comment'] + $_SESSION['system_update_178_node']) /
+        ($_SESSION['system_update_178_comment_max'] + $_SESSION['system_update_178_node_max'])
+      );
+    }
+  }
+
+  return array();
+}
+
+/**
+ * Update base paths for relative URLs in custom blocks, profiles and various variables.
+ */
+function system_update_179() {
+
+  if (variable_get('clean_url', 0) == 1) {
+    // Multi-part update
+    if (!isset($_SESSION['system_update_179_uid'])) {
+      // Check which formats need to be converted
+      $formats = _update_178_url_formats();
+      if (count($formats) == 0) {
+        return array();
+      }
+
+      // Custom Blocks (too small for multipart)
+      $format_string = '('. substr(str_repeat('%d, ', count($formats)), 0, -2) .')';
+      $result = db_query("SELECT bid, body FROM {boxes} WHERE format IN ". $format_string, array_keys($formats));
+      while ($block = db_fetch_object($result)) {
+        $block->body = _update_178_url_fix($block->body);
+        if ($block->body !== FALSE) {
+          db_query("UPDATE {boxes} SET body = '%s' WHERE bid = %d", $block->body, $block->bid);
+        }
+      }
+
+      // Variables (too small for multipart)
+      $vars = array('site_mission', 'site_footer', 'user_registration_help');
+      foreach (node_get_types() as $type => $name) {
+        $vars[] = $type .'_help';
+      }
+      foreach ($vars as $var) {
+        $value = variable_get($var, NULL);
+        if (!is_null($value)) {
+          $value = _update_178_url_fix($value);
+          if ($value !== FALSE) {
+            variable_set($var, $value);
+          }
+        }
+      }
+
+      // See if profiles need to be updated: is the default format HTML?
+      if (!isset($formats[variable_get('filter_default_format', 1)])) {
+        return array();
+      }
+      $result = db_query("SELECT fid FROM {profile_fields} WHERE type = 'textarea'");
+      $fields = array();
+      while ($field = db_fetch_object($result)) {
+        $fields[] = $field->fid;
+      }
+      if (count($fields) == 0) {
+        return array();
+      }
+
+      // Begin multi-part update for profiles
+      $_SESSION['system_update_179_fields'] = $fields;
+      $_SESSION['system_update_179_field_string'] = '('. substr(str_repeat('%d, ', count($fields)), 0, -2) .')';
+      $_SESSION['system_update_179_uid'] = 0;
+      $_SESSION['system_update_179_fid'] = 0;
+      $_SESSION['system_update_179_max'] = db_result(db_query('SELECT MAX(uid) FROM {profile_values} WHERE fid IN '. $_SESSION['system_update_179_field_string'], $_SESSION['system_update_179_fields']));
+    }
+
+    // Fetch next 20 profile values to convert
+    $limit = 20;
+    $args = array_merge(array($_SESSION['system_update_179_uid'], $_SESSION['system_update_179_fid'], $_SESSION['system_update_179_uid']), $_SESSION['system_update_179_fields']);
+    $result = db_query_range("SELECT fid, uid, value FROM {profile_values} WHERE ((uid = %d AND fid > %d) OR uid > %d) AND fid IN ". $_SESSION['system_update_179_field_string'] .' ORDER BY uid ASC, fid ASC', $args, 0, $limit);
+    while ($field = db_fetch_object($result)) {
+      $_SESSION['system_update_179_uid'] = $field->uid;
+      $_SESSION['system_update_179_fid'] = $field->fid;
+      $field->value = _update_178_url_fix($field->value);
+      if ($field->value !== FALSE) {
+        db_query("UPDATE {profile_values} SET value = '%s' WHERE uid = %d AND fid = %d", $field->value, $field->uid, $field->fid);
+      }
+
+    }
+
+    // Done?
+    if (db_num_rows($result) == 0) {
+      unset($_SESSION['system_update_179_uid']);
+      unset($_SESSION['system_update_179_fid']);
+      unset($_SESSION['system_update_179_max']);
+      return array();
+    }
+    else {
+      // Report percentage finished
+      // (Note: make sure we complete all fields for the last user by not reporting 100% too early)
+      return array('#finished' => $_SESSION['system_update_179_uid'] / ($_SESSION['system_update_179_max'] + 1));
+    }
+  }
+
+  return array();
+}
+
+function system_update_180() {
+  $ret = array();
+
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+      $ret[] = update_sql("ALTER TABLE {node} DROP PRIMARY KEY");
+      $ret[] = update_sql("ALTER TABLE {node} ADD PRIMARY KEY (nid, vid)");
+      $ret[] = update_sql("ALTER TABLE {node} DROP INDEX vid");
+      $ret[] = update_sql("ALTER TABLE {node} ADD UNIQUE (vid)");
+      $ret[] = update_sql("ALTER TABLE {node} ADD INDEX (nid)");
+
+      $ret[] = update_sql("ALTER TABLE {node_counter} CHANGE nid nid INT(10) NOT NULL DEFAULT '0'");
+      break;
+    case 'pgsql':
+      $ret[] = update_sql("ALTER TABLE {node} DROP CONSTRAINT {node}_pkey"); // Change PK
+      $ret[] = update_sql("ALTER TABLE {node} ADD PRIMARY KEY (nid, vid)");
+      $ret[] = update_sql('DROP INDEX {node}_vid_idx'); // Change normal index to UNIQUE index
+      $ret[] = update_sql('CREATE UNIQUE INDEX {node}_vid_idx ON {node}(vid)');
+      $ret[] = update_sql('CREATE INDEX {node}_nid_idx ON {node}(nid)'); // Add index on nid
+      break;
+  }
+
+  return $ret;
+}
+
+function system_update_181() {
+  $ret = array();
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+      $ret[] = update_sql("ALTER TABLE {profile_fields} ADD autocomplete TINYINT(1) NOT NULL AFTER visibility ;");
+      break;
+    case 'pgsql':
+      db_add_column($ret, 'profile_fields', 'autocomplete', 'smallint', array('not null' => TRUE, 'default' => 0));
+      break;
+  }
+  return $ret;
+}
+
+/**
+ * The lid field in pgSQL should not be UNIQUE, but an INDEX.
+ */
+function system_update_182() {
+  $ret = array();
+
+  if ($GLOBALS['db_type'] == 'pgsql') {
+    $ret[] = update_sql('ALTER TABLE {locales_target} DROP CONSTRAINT {locales_target}_lid_key');
+    $ret[] = update_sql('CREATE INDEX {locales_target}_lid_idx ON {locales_target} (lid)');
+  }
+
+  return $ret;
+}
+
+function system_update_183() {
+  $ret = array();
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+    $ret[] = update_sql("CREATE TABLE {blocks_roles} (
+      module varchar(64) NOT NULL,
+      delta varchar(32) NOT NULL,
+      rid int(10) unsigned NOT NULL,
+      PRIMARY KEY (module, delta, rid)
+      ) /*!40100 DEFAULT CHARACTER SET utf8 */;");
+    break;
+
+    case 'pgsql':
+    $ret[] = update_sql("CREATE TABLE {blocks_roles} (
+      module varchar(64) NOT NULL,
+      delta varchar(32) NOT NULL,
+      rid integer NOT NULL,
+      PRIMARY KEY (module, delta, rid)
+      );");
+    break;
+
+  }
+  return $ret;
+}
+
+function system_update_184() {
+  // change DB schema for better poll support
+  $ret = array();
+
+  switch ($GLOBALS['db_type']) {
+    case 'mysqli':
+    case 'mysql':
+      // alter poll_votes table
+      $ret[] = update_sql("ALTER TABLE {poll_votes} ADD COLUMN chorder int(10) NOT NULL default -1 AFTER uid");
+      break;
+
+    case 'pgsql':
+      db_add_column($ret, 'poll_votes', 'chorder', 'int', array('not null' => TRUE, 'default' => "'-1'"));
+      break;
+  }
+
+  return $ret;
+}
+
+function system_update_185() {
+  // Make the forum's vocabulary the highest in list, if present
+  $ret = array();
+
+  if ($vid = (int) variable_get('forum_nav_vocabulary', 0)) {
+    $ret[] = update_sql('UPDATE {vocabulary} SET weight = -10 WHERE vid = '. $vid);
+  }
+
+  return $ret;
+}
+
+function system_update_186() {
+  // Make use of guid in feed items
+  $ret = array();
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+      $ret[] = update_sql("ALTER TABLE {aggregator_item} ADD guid varchar(255) AFTER timestamp ;");
+      break;
+    case 'pgsql':
+      db_add_column($ret, 'aggregator_item', 'guid', 'varchar(255)');
+      break;
+  }
+  return $ret;
+}
+
+
+function system_update_187() {
+  // Increase the size of bid in boxes and aid in access
+  $ret = array();
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+    $ret[] = update_sql("ALTER TABLE {access} CHANGE `aid` `aid` INT( 10 ) NOT NULL AUTO_INCREMENT ");
+    $ret[] = update_sql("ALTER TABLE {boxes} CHANGE `bid` `bid` INT( 10 ) NOT NULL AUTO_INCREMENT ");
+      break;
+    case 'pgsql':
+      // No database update required for PostgreSQL because it already uses big SERIAL numbers.
+      break;
+  }
+  return $ret;
+}
=== added directory 'profiles'
=== added file 'profiles/default.profile'
--- /dev/null	
+++ profiles/default.profile	
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * Return an array of the modules to be enabled when this profile is installed.
+ *
+ * @return
+ *  An array of modules to be enabled.
+ */
+function default_profile_modules() {
+  return array('block', 'comment', 'filter', 'help', 'menu', 'node', 'page', 'story', 'system', 'taxonomy', 'user', 'watchdog');
+}
+
+/**
+ * Return a description of the profile.
+ */
+function default_profile_details() {
+  return array(
+    'name' => 'Drupal',
+    'description' => 'Select this profile to enable some basic Drupal functionality and the default theme.'
+  );
+}
=== modified file 'includes/bootstrap.inc'
--- includes/bootstrap.inc	
+++ includes/bootstrap.inc	
@@ -151,9 +151,9 @@ function drupal_unset_globals() {
  * Loads the configuration and sets the base URL correctly.
  */
 function conf_init() {
-  global $db_url, $db_prefix, $base_url, $base_path, $base_root, $conf;
+  global $db_url, $db_prefix, $base_url, $base_path, $base_root, $conf, $installed_profile;
   $conf = array();
-  require_once './'. conf_path() .'/settings.php';
+  include_once './'. conf_path() .'/settings.php';
 
   if (isset($base_url)) {
     // Parse fixed base URL from settings.php.
@@ -565,14 +565,21 @@ function drupal_set_message($message = N
 /**
  * Return all messages that have been set.
  *
- * As a side effect, this function clears the message queue.
+ * @param $type
+ *   (optional) Only return messages of this type.
  */
-function drupal_get_messages() {
+function drupal_get_messages($type = NULL) {
   if ($messages = drupal_set_message()) {
-    unset($_SESSION['messages']);
+    if ($type) {
+      unset($_SESSION['messages'][$type]);
+      return array($type => $messages[$type]);
+    }
+    else {
+      unset($_SESSION['messages']);
+      return $messages;      
+    }
   }
-
-  return $messages;
+  return array();
 }
 
 /**
=== modified file 'includes/database.mysql.inc'
--- includes/database.mysql.inc	
+++ includes/database.mysql.inc	
@@ -53,7 +53,8 @@ function db_connect($url) {
   if (!$connection) {
     drupal_maintenance_theme();
     drupal_set_title('Unable to connect to database server');
-    print theme('maintenance_page', '<p>This either means that the username and password information in your <code>settings.php</code> file is incorrect or we can\'t contact the MySQL database server. This could mean your hosting provider\'s database server is down.</p>
+    print theme('maintenance_page', '<p>If you are setting up Drupal on a new web site, proceed to the <a href="'. base_path() .'install.php">database configuration page.</a></p>
+<p>If you have already finished configuring Drupal, this either means that the username and password information in your <code>settings.php</code> file is incorrect or we can\'t contact the MySQL database server. This could mean your hosting provider\'s database server is down.</p>
 <p>The MySQL error was: '. theme('placeholder', mysql_error()) .'.</p>
 <p>Currently, the username is '. theme('placeholder', $url['user']) .' and the database server is '. theme('placeholder', $url['host']) .'.</p>
 <ul>
=== modified file 'includes/database.mysqli.inc'
--- includes/database.mysqli.inc	
+++ includes/database.mysqli.inc	
@@ -45,7 +45,8 @@ function db_connect($url) {
   if (mysqli_connect_errno() >= 2000 || mysqli_connect_errno() == 1045) {
     drupal_maintenance_theme();
     drupal_set_title('Unable to connect to database server');
-    print theme('maintenance_page', '<p>This either means that the username and password information in your <code>settings.php</code> file is incorrect or we can\'t contact the MySQL database server through the mysqli libraries. This could also mean your hosting provider\'s database server is down.</p>
+    print theme('maintenance_page', '<p>If you are setting up Drupal on a new web site, proceed to the <a href="'. base_path() .'install.php">database configuration page.</a></p>
+<p>If you have already finished configuring Drupal, this either means that the username and password information in your <code>settings.php</code> file is incorrect or we can\'t contact the MySQL database server through the mysqli libraries. This could also mean your hosting provider\'s database server is down.</p>
 <p>The MySQL error was: '. theme('placeholder', mysqli_error($connection)) .'.</p>
 <p>Currently, the username is '. theme('placeholder', $url['user']) .' and the database server is '. theme('placeholder', $url['host']) .'.</p>
 <ul>
=== modified file 'includes/database.pgsql.inc'
--- includes/database.pgsql.inc	
+++ includes/database.pgsql.inc	
@@ -51,7 +51,8 @@ function db_connect($url) {
   if (!$connection) {
     drupal_maintenance_theme();
     drupal_set_title('Unable to connect to database');
-    print theme('maintenance_page', '<p>This either means that the database information in your <code>settings.php</code> file is incorrect or we can\'t contact the PostgreSQL database server. This could mean your hosting provider\'s database server is down.</p>
+    print theme('maintenance_page', '<p>If you are setting up Drupal on a new web site, proceed to the <a href="install.php">database configuration page.</a></p>
+<p>If you have already finished configuring Drupal, this either means that the database information in your <code>settings.php</code> file is incorrect or we can\'t contact the PostgreSQL database server. This could mean your hosting provider\'s database server is down.</p>
 <p>The PostgreSQL error was: '. theme('placeholder', decode_entities($php_errormsg)) .'</p>
 <p>Currently, the database is '. theme('placeholder', substr($url['path'], 1)) .', the username is '. theme('placeholder', $url['user']) .', and the database server is '. theme('placeholder', $url['host']) .'.</p>
 <ul>
=== modified file 'includes/install.inc'
--- includes/install.inc	
+++ includes/install.inc	
@@ -4,15 +4,29 @@
 define('SCHEMA_UNINSTALLED', -1);
 define('SCHEMA_INSTALLED', 0);
 
+define('DRUPAL_MINIMUM_PHP',    '4.3.3');
+define('DRUPAL_MINIMUM_MEMORY', '8M');
+define('DRUPAL_MINIMUM_MYSQL',  '3.23.17'); // If using MySQL
+define('DRUPAL_MINIMUM_PGSQL',  '7.3');  // If using PostgreSQL
+define('DRUPAL_MINIMUM_APACHE', '1.3');  // If using Apache
 
-// The system module (Drupal core) is currently a special case
-include_once './database/updates.inc';
+define('FILE_EXIST',          1);
+define('FILE_READABLE',       2);
+define('FILE_WRITABLE',       4);
+define('FILE_EXECUTABLE',     8);
+define('FILE_NOT_EXIST',      16);
+define('FILE_NOT_READABLE',   32);
+define('FILE_NOT_WRITABLE',   64);
+define('FILE_NOT_EXECUTABLE', 128);
 
-// Include install files for each module
-foreach (module_list() as $module) {
-  $install_file = './'. drupal_get_path('module', $module) .'/'. $module .'.install';
-  if (is_file($install_file)) {
-    include_once $install_file;
+// Initialize the update system if necessary
+if (!$install) {
+  // Include install files for each installed module.
+  foreach (module_list() as $module) {
+    $install_file = './'. drupal_get_path('module', $module) .'/'. $module .'.install';
+    if (is_file($install_file)) {
+      include_once $install_file;
+    }
   }
 }
 
@@ -79,3 +93,410 @@ function drupal_get_installed_schema_ver
 function drupal_set_installed_schema_version($module, $version) {
   db_query("UPDATE {system} SET schema_version = %d WHERE name = '%s'", $version, $module);
 }
+
+/**
+ * Loads the profile definition, extracting the profile's defined name.
+ *
+ * @return
+ *   The name defined in the profile's _profile_details() hook.
+ */
+function drupal_install_profile_name() {
+  global $profile;
+  static $name = NULL;
+
+  if (!isset($name)) {
+    // Load profile details.
+    $function = $profile .'_profile_details';
+    if (function_exists($function)) {
+      $details = $function();
+    }
+    $name = isset($details['name']) ? $details['name'] : 'Drupal';
+  }
+
+  return $name;
+}
+
+/**
+ * Auto detect the base_url with PHP predefined variables.
+ *
+ * @param $file
+ *   The name of the file calling this function so we can strip it out of
+ *   the URI when generating the base_url.
+ *
+ * @return
+ *   The auto-detected $base_url that should be configured in settings.php
+ */
+function drupal_detect_baseurl($file = 'install.php') {
+  global $profile;
+  $proto = $_SERVER['HTTPS'] ? 'https://' : 'http://';
+  $host = $_SERVER['SERVER_NAME'];
+  $port = ($_SERVER['SERVER_PORT'] == 80 ? '' : ':'. $_SERVER['SERVER_PORT']);
+  $uri = str_replace("?profile=$profile", '', $_SERVER['REQUEST_URI']);
+  $dir = str_replace("/$file", '', $uri);
+
+  return "$proto$host$port$dir";
+}
+
+/**
+ * Detect all databases supported by Drupal that are compiled into the current
+ * PHP installation.
+ *
+ * @return
+ *  An array of database types compiled into PHP.
+ */
+function drupal_detect_database_types() {
+  $databases = array();
+
+  foreach (array('mysql', 'mysqli', 'pgsql') as $type) {
+    if (file_exists('./includes/install.'. $type .'.inc')) {
+      include_once './includes/install.'. $type .'.inc';
+      $function = $type .'_is_available';
+      if ($function()) {
+        $databases[$type] = $type;
+      }
+    }
+  }
+
+  return $databases;
+}
+
+/**
+ * Read settings.php into a buffer line by line, changing values specified in
+ * $settings array, then over-writing the old settings.php file.
+ *
+ * @param $settings
+ *   An array of settings that need to be updated.
+ */
+function drupal_rewrite_settings($settings = array(), $prefix = '') {
+  $settings_file = './'. conf_path() .'/'. $prefix .'settings.php';
+
+  // Build list of setting names and insert the values into the global namespace.
+  $keys = array();
+  foreach ($settings as $setting => $data) {
+    $GLOBALS[$setting] = $data['value'];
+    $keys[] = $setting;
+  }
+
+  $buffer = NULL;
+  $first = TRUE;
+  if ($fp = @fopen($settings_file, 'r+')) {
+    // Step line by line through settings.php.
+    while (!feof($fp)) {
+      $line = fgets($fp);
+      if ($first && substr($line, 0, 5) != '<?php') {
+        $buffer = "<?php\n\n";
+      }
+      $first = FALSE;
+      // Check for constants.
+      if (substr($line, 0, 7) == 'define(') {
+        preg_match('/define\(\s*[\'"]([A-Z_-]+)[\'"]\s*,(.*?)\);/', $line, $variable);
+        if (in_array($variable[1], $keys)) {
+          $setting = $settings[$variable[1]];
+          $buffer .= str_replace($variable[2], " '". $setting['value'] ."'", $line);
+          unset($settings[$variable[1]]);
+          unset($settings[$variable[2]]);
+        }
+        else {
+          $buffer .= $line;
+        }
+      }
+      // Check for variables.
+      elseif (substr($line, 0, 1) == '$') {
+        preg_match('/\$([^ ]*) /', $line, $variable);
+        if (in_array($variable[1], $keys)) {
+          // Write new value to settings.php in the following format:
+          //    $'setting' = 'value'; // 'comment'
+          $setting = $settings[$variable[1]];
+          $buffer .= '$'. $variable[1] ." = '". $setting['value'] ."';". ($setting['comment'] ? ' // '. $setting['comment'] ."\n" : "\n");
+          unset($settings[$variable[1]]);
+        }
+        else {
+          $buffer .= $line;
+        }
+      }
+      else {
+        $buffer .= $line;
+      }
+    }
+    fclose($fp);
+
+    // Add required settings that were missing from settings.php.
+    foreach ($settings as $setting => $data) {
+      if ($data['required']) {
+        $buffer .= "\$$setting = '". $data['value'] ."';\n";
+      }
+    }
+
+    $fp = fopen($settings_file, 'w');
+    if ($fp && fwrite($fp, $buffer) === FALSE) {
+        drupal_set_message(st('Failed to modify %settings, please verify the file permissions.', array('%settings' => $settings_file)), 'error');
+    }
+  }
+  else {
+    drupal_set_message(st('Failed to open %settings, please verify the file permissions.', array('%settings' => $settings_file)), 'error');
+  }
+}
+ 
+/**
+ * Get list of all .install files.
+ *
+ * @param $module_list
+ *   An array of modules to search for their .install files.
+ */
+function drupal_get_install_files($module_list = array()) {
+  $installs = array();
+  foreach ($module_list as $module) {
+    $installs = array_merge($installs, file_scan_directory('./modules', "^$module.install$", array('.', '..', 'CVS'), 0, TRUE, 'name', 0));
+  }
+  return $installs;
+}
+
+/**
+ * Install a profile.
+ *
+ * @param profile
+ *   Name of profile to install.
+ */
+function drupal_install_profile($profile) {
+  global $db_type;
+
+  include_once './includes/file.inc';
+
+  $profile_file = "./profiles/$profile.profile";
+
+  if (!isset($profile) || !file_exists($profile_file)) {
+    _install_no_profile_error();
+  }
+
+  require_once($profile_file);
+
+  // Get a list of modules required by this profile.
+  $function = $profile .'_profile_modules';
+  $module_list = $function();
+
+  // Verify that all required modules exist.
+  $modules = array();
+  foreach ($module_list as $current) {
+    $module = file_scan_directory('./modules', "^$current.module$", array('.', '..', 'CVS'), 0, TRUE, 'name', 0);
+    if (empty($module)) {
+      drupal_set_message(st('The %module module is required but was not found. Please move the file %file into the <em>modules</em> subdirectory.', array('%module' => $current, '%file' => $current .'.module')), 'error');
+    }
+    else {
+      $modules = array_merge($modules, $module);
+    }
+  }
+
+  // Get a list of all .install files.
+  $installs = drupal_get_install_files($module_list);
+
+  // Install schemas for profile and all its modules.
+  $function = $profile .'_install';
+  if (function_exists($function)) {
+    $function();
+  }
+
+  foreach ($installs as $install) {
+    require_once $install->filename;
+    module_invoke($install->name, 'install');
+  }
+
+  // Enable the modules required by the profile.
+  db_query("DELETE FROM {system} WHERE type = 'module'");
+  foreach ($modules as $module) {
+    db_query("INSERT INTO {system} (filename, name, type, description, status, throttle, bootstrap, schema_version) VALUES('%s', '%s', 'module', '', 1, 0, 0, 0)", $module->filename, $module->name);
+  }
+}
+
+/**
+ * Verify the state of the specified file.
+ *
+ * @param $file
+ *   The file to check for.
+ * @param $mask
+ *   An optional bitmask created from various FILE_* constants.
+ * @param $message_type
+ *   The type of message to create, can be error or status. Passed on to drupal_set_message as second parameter.
+ *   Set to NULL to not output any messages at all.
+ * @param $type
+ *   The type of file. Can be file (default), dir, or link.
+ * @return
+ *   TRUE on success or FALSE on failure. A messsage is set for the latter.
+ */
+function drupal_verify_install_file($file, $mask = NULL, $type = 'file') {
+  $return = TRUE;
+  // Check for files that shouldn't be there.
+  if (isset($mask) && ($mask & FILE_NOT_EXIST) && file_exists($file)) {
+    return FALSE;
+  }
+  // Verify that the file is the type of file it is supposed to be.
+  if (isset($type) && file_exists($file)) {
+    $check = 'is_'. $type;
+    if (!function_exists($check) || !$check($file)) {
+      $return = FALSE;
+    }
+  }
+
+  // Verify file permissions.
+  if (isset($mask)) {
+    $masks = array(FILE_EXIST, FILE_READABLE, FILE_WRITABLE, FILE_EXECUTABLE, FILE_NOT_READABLE, FILE_NOT_WRITABLE, FILE_NOT_EXECUTABLE);
+    foreach ($masks as $current_mask) {
+      if ($mask & $current_mask) {
+        switch ($current_mask) {
+          case FILE_EXIST:
+            if (!file_exists($file)) {
+              if ($type == 'dir') {
+                drupal_install_mkdir($file, $mask);
+              }
+              if (!file_exists($file)) {
+                $return = FALSE;
+              }
+            }
+            break;
+          case FILE_READABLE:
+            if (!is_readable($file) && !drupal_install_fix_file($file, $mask)) {
+              $return = FALSE;
+            }
+            break;
+          case FILE_WRITABLE:
+            if (!is_writable($file) && !drupal_install_fix_file($file, $mask)) {
+              $return = FALSE;
+            }
+            break;
+          case FILE_EXECUTABLE:
+            if (!is_executable($file) && !drupal_install_fix_file($file, $mask)) {
+              $return = FALSE;
+            }
+            break;
+          case FILE_NOT_READABLE:
+            if (is_readable($file) && !drupal_install_fix_file($file, $mask)) {
+              $return = FALSE;
+            }
+            break;
+          case FILE_NOT_WRITABLE:
+            if (is_writable($file) && !drupal_install_fix_file($file, $mask)) {
+              $return = FALSE;
+            }
+            break;
+          case FILE_NOT_EXECUTABLE:
+            if (is_executable($file) && !drupal_install_fix_file($file, $mask)) {
+              $return = FALSE;
+            }
+            break;
+        }
+      }
+    }
+  }
+  return $return;
+}
+
+/**
+ * Create a directory with specified permissions.
+ *
+ * @param file
+ *  The name of the directory to create;
+ * @param mask
+ *  The permissions of the directory to create.
+ * @param $message
+ *  (optional) Whether to output messages. Defaults to TRUE.
+ *
+ * @return
+ *  TRUE/FALSE whether or not the directory was successfully created.
+ */
+function drupal_install_mkdir($file, $mask, $message = TRUE) {
+  $mod = 0;
+  $masks = array(FILE_READABLE, FILE_WRITABLE, FILE_EXECUTABLE, FILE_NOT_READABLE, FILE_NOT_WRITABLE, FILE_NOT_EXECUTABLE);
+  foreach ($masks as $m) {
+    if ($mask & $m) {
+      switch ($m) {
+        case FILE_READABLE:
+          $mod += 444;
+          break;
+        case FILE_WRITABLE:
+          $mod += 222;
+          break;
+        case FILE_EXECUTABLE:
+          $mod += 111;
+          break;
+      }
+    }
+  }
+
+  if (@mkdir($file, intval("0$mod", 8))) {
+    return TRUE;
+  }
+  else {
+    return FALSE;
+  }
+}
+
+/**
+ * Attempt to fix file permissions.
+ *
+ * @param $file
+ *  The name of the file with permissions to fix.
+ * @param $mask
+ *  The desired permissions for the file.
+ * @param $message
+ *  (optional) Whether to output messages. Defaults to TRUE.
+ *
+ * @return
+ *  TRUE/FALSE whether or not we were able to fix the file's permissions.
+ */
+function drupal_install_fix_file($file, $mask, $message = TRUE) {
+  $mod = substr(sprintf('%o', fileperms($file)), -4);
+  $prefix = substr($mod, 0, 1);
+  $mod = substr($mod, 1 ,4);
+  $masks = array(FILE_READABLE, FILE_WRITABLE, FILE_EXECUTABLE, FILE_NOT_READABLE, FILE_NOT_WRITABLE, FILE_NOT_EXECUTABLE);
+  foreach ($masks as $m) {
+    if ($mask & $m) {
+      switch ($m) {
+        case FILE_READABLE:
+          if (!is_readable($file)) {
+            $mod += 444;
+          }
+          break;
+        case FILE_WRITABLE:
+          if (!is_writable($file)) {
+            $mod += 222;
+          }
+          break;
+        case FILE_EXECUTABLE:
+          if (!is_executable($file)) {
+            $mod += 111;
+          }
+          break;
+        case FILE_NOT_READABLE:
+          if (is_readable($file)) {
+            $mod -= 444;
+          }
+          break;
+        case FILE_NOT_WRITABLE:
+          if (is_writable($file)) {
+            $mod -= 222;
+          }
+          break;
+        case FILE_NOT_EXECUTABLE:
+          if (is_executable($file)) {
+            $mod -= 111;
+          }
+          break;
+      }
+    }
+  }
+
+  if (@chmod($file, intval("$prefix$mod", 8))) {
+    return TRUE;
+  }
+  else {
+    return FALSE;
+  }
+}
+
+/**
+ * Hardcoded function for doing the equivalent of theme('placeholder')
+ * when the theme system is not available.
+ */
+function st($string, $args = array()) {
+  require_once './includes/theme.inc';
+  return strtr($string, array_map('theme_placeholder', $args));
+}
\ No newline at end of file
=== modified file 'includes/module.inc'
--- includes/module.inc	
+++ includes/module.inc	
@@ -37,31 +37,42 @@ function module_iterate($function, $argu
  * @param $sort
  *   By default, modules are ordered by weight and filename, settings this option
  *   to TRUE, module list will be ordered by module name.
+ * @param $fixed_list
+ *   (Optional) Override the module list with the given modules. Stays until the
+ *   next call with $refresh = TRUE.
  * @return
  *   An associative array whose keys and values are the names of all loaded
  *   modules.
  */
-function module_list($refresh = FALSE, $bootstrap = TRUE, $sort = FALSE) {
+function module_list($refresh = FALSE, $bootstrap = TRUE, $sort = FALSE, $fixed_list = NULL) {
   static $list, $sorted_list;
 
-  if ($refresh) {
+  if ($refresh || $fixed_list) {
     unset($sorted_list);
     $list = array();
-    if ($bootstrap) {
-      $result = db_query("SELECT name, filename, throttle, bootstrap FROM {system} WHERE type = 'module' AND status = 1 AND bootstrap = 1 ORDER BY weight ASC, filename ASC");
+    if ($fixed_list) {
+      foreach ($fixed_list as $name => $module) {
+        drupal_get_filename('module', $name, $module['filename']);
+        $list[$name] = $name;
+      }
     }
     else {
-      $result = db_query("SELECT name, filename, throttle, bootstrap FROM {system} WHERE type = 'module' AND status = 1 ORDER BY weight ASC, filename ASC");
-    }
-    while ($module = db_fetch_object($result)) {
-      if (file_exists($module->filename)) {
-        // Determine the current throttle status and see if the module should be
-        // loaded based on server load. We have to directly access the throttle
-        // variables, since throttle.module may not be loaded yet.
-        $throttle = ($module->throttle && variable_get('throttle_level', 0) > 0);
-        if (!$throttle) {
-          drupal_get_filename('module', $module->name, $module->filename);
-          $list[$module->name] = $module->name;
+      if ($bootstrap) {
+        $result = db_query("SELECT name, filename, throttle, bootstrap FROM {system} WHERE type = 'module' AND status = 1 AND bootstrap = 1 ORDER BY weight ASC, filename ASC");
+      }
+      else {
+        $result = db_query("SELECT name, filename, throttle, bootstrap FROM {system} WHERE type = 'module' AND status = 1 ORDER BY weight ASC, filename ASC");
+      }
+      while ($module = db_fetch_object($result)) {
+        if (file_exists($module->filename)) {
+          // Determine the current throttle status and see if the module should be
+          // loaded based on server load. We have to directly access the throttle
+          // variables, since throttle.module may not be loaded yet.
+          $throttle = ($module->throttle && variable_get('throttle_level', 0) > 0);
+          if (!$throttle) {
+            drupal_get_filename('module', $module->name, $module->filename);
+            $list[$module->name] = $module->name;
+          }
         }
       }
     }
=== modified file 'includes/theme.inc'
--- includes/theme.inc	
+++ includes/theme.inc	
@@ -431,7 +431,7 @@ function theme_maintenance_page($content
   $output = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
   $output .= '<html xmlns="http://www.w3.org/1999/xhtml">';
   $output .= '<head>';
-  $output .= ' <title>'. drupal_get_title() .'</title>';
+  $output .= ' <title>'. strip_tags(drupal_get_title()) .'</title>';
   $output .= drupal_get_html_head();
   $output .= theme_get_styles();
   $output .= '</head>';
@@ -453,33 +453,69 @@ function theme_maintenance_page($content
   return $output;
 }
 
+function theme_install_page($content) {
+  drupal_set_header('Content-Type: text/html; charset=utf-8');
+  theme('add_style', 'misc/maintenance.css');
+  drupal_set_html_head('<link rel="shortcut icon" href="'. base_path() .'misc/favicon.ico" type="image/x-icon" />');
+  $output = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
+  $output .= '<html xmlns="http://www.w3.org/1999/xhtml">';
+  $output .= '<head>';
+  $output .= ' <title>'. strip_tags(drupal_get_title()) .'</title>';
+  $output .= drupal_get_html_head();
+  $output .= theme_get_styles();
+  $output .= '</head>';
+  $output .= '<body>';
+  $output .= '<h1>' . drupal_get_title() . '</h1>';
+
+  $messages = drupal_set_message();
+  if (isset($messages['error'])) {
+    $errors = count($messages['error']) > 1 ? 'errors' : 'error';
+    $output .= "<h3>The following $errors must be resolved before you can continue the installation process:</h3>";
+    $output .= theme('status_messages', 'error');
+  }
+
+  $output .= "\n<!-- begin content -->\n";
+  $output .= $content;
+  $output .= "\n<!-- end content -->\n";
+
+  if (isset($messages['status'])) {
+    $warnings = count($messages['status']) > 1 ? 'warnings' : 'warning';
+    $output .= "<h4>The following installation $warnings should be carefully reviewed, but in most cases may be safely ignored:</h4>";
+    $output .= theme('status_messages', 'status');
+  }
+
+  $output .= '</body></html>';
+
+  return $output;
+}
+
 /**
- * Returns themed set of status and/or error messages. The messages are grouped
+ * Return a themed set of status and/or error messages. The messages are grouped
  * by type.
  *
+ * @param $display
+ *   (optional) Set to 'status' or 'error' to display only messages of that type.
+ *
  * @return
  *   A string containing the messages.
  */
-function theme_status_messages() {
-  if ($data = drupal_get_messages()) {
-    $output = '';
-    foreach ($data as $type => $messages) {
-      $output .= "<div class=\"messages $type\">\n";
-      if (count($messages) > 1) {
-        $output .= " <ul>\n";
-        foreach($messages as $message) {
-          $output .= '  <li>'. $message ."</li>\n";
-        }
-        $output .= " </ul>\n";
-      }
-      else {
-        $output .= $messages[0];
+function theme_status_messages($display = NULL) {
+  $output = '';
+  foreach (drupal_get_messages($display) as $type => $messages) {
+    $output .= "<div class=\"messages $type\">\n";
+    if (count($messages) > 1) {
+      $output .= " <ul>\n";
+      foreach($messages as $message) {
+        $output .= '  <li>'. $message ."</li>\n";
       }
-      $output .= "</div>\n";
+      $output .= " </ul>\n";
     }
-
-    return $output;
+    else {
+      $output .= $messages[0];
+    }
+    $output .= "</div>\n";
   }
+  return $output;
 }
 
 /**
=== modified file 'misc/maintenance.css'
--- misc/maintenance.css	
+++ misc/maintenance.css	
@@ -6,6 +6,7 @@ body {
   border: 1px solid #bbb;
   margin: 3em;
   padding: 1em 1em 1em 128px;
+  line-height: 1.2;
 }
 h1 {
   margin: 1.6em 0 1.1em 0;
@@ -28,8 +29,15 @@ div.messages {
   margin-top: 1em;
 }
 
+div.messages li {
+  margin-top: 0.5em;
+  margin-bottom: 0.5em;
+}
+
 div.error {
+  background: #fdd;
   border: 1px solid #daa;
+  color: #400;
 }
 
 /* Update styles */
=== modified file 'update.php'
--- update.php	
+++ update.php	
@@ -363,13 +363,14 @@ function update_selection_page() {
 
 function update_update_page() {
   // Set the installed version so updates start at the correct place.
-  $_SESSION['update_remaining'] = array();
+  // Ensure system.module's updates are run first by making it the first element.
+  $_SESSION['update_remaining'] = array('system' => '');
   foreach ($_POST['edit']['start'] as $module => $version) {
     drupal_set_installed_schema_version($module, $version - 1);
     $max_version = max(drupal_get_schema_versions($module));
     if ($version <= $max_version) {
       foreach (range($version, $max_version) as $update) {
-        $_SESSION['update_remaining'][] = array('module' => $module, 'version' => $update);
+        $_SESSION['update_remaining'][$module] = array('module' => $module, 'version' => $update);
       }
     }
   }
@@ -676,6 +677,7 @@ ini_set('display_errors', TRUE);
 // Access check:
 if (($access_check == FALSE) || ($user->uid == 1)) {
 
+  $install = FALSE;
   include_once './includes/install.inc';
 
   update_fix_schema_version();