diff options
| -rw-r--r-- | includes/form.inc | 4 | ||||
| -rw-r--r-- | includes/session.inc | 2 | ||||
| -rw-r--r-- | install.php | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/includes/form.inc b/includes/form.inc index c99f423c0..cbaec8caa 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -763,6 +763,10 @@ function theme_fieldset($element) { if ($element['#collapsible']) { drupal_add_js('misc/collapse.js'); + if (!isset($element['#attributes']['class'])) { + $element['#attributes']['class'] = ''; + } + $element['#attributes']['class'] .= ' collapsible'; if ($element['#collapsed']) { $element['#attributes']['class'] .= ' collapsed'; diff --git a/includes/session.inc b/includes/session.inc index 78ec82051..4e219337e 100644 --- a/includes/session.inc +++ b/includes/session.inc @@ -27,7 +27,7 @@ function sess_read($key) { $user = db_fetch_object(db_query("SELECT u.*, s.* FROM {users} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.sid = '%s'", $key)); // We found the client's session record and they are an authenticated user - if ($user->uid > 0) { + if ($user && $user->uid > 0) { // This is done to unserialize the data member of $user $user = drupal_unpack($user); diff --git a/install.php b/install.php index 7c88eab34..46545edad 100644 --- a/install.php +++ b/install.php @@ -140,7 +140,7 @@ function install_change_settings() { if ($db_url == 'mysql://username:password@localhost/databasename') { $db_user = $db_pass = $db_path = ''; } - $output = drupal_get_form('install_settings_form', $profile, $settings_file, $db_url, $db_type, $db_prefix, $db_user, $db_pass, $db_host); + $output = drupal_get_form('install_settings_form', $profile, $settings_file, $db_url, $db_type, $db_prefix, $db_user, $db_pass, $db_host, $db_path); drupal_set_title('Database configuration'); print theme('install_page', $output); exit; @@ -150,7 +150,7 @@ function install_change_settings() { /** * Form API array definition for install_settings. */ -function install_settings_form($profile, $settings_file, $db_url, $db_type, $db_prefix, $db_user, $db_pass, $db_host) { +function install_settings_form($profile, $settings_file, $db_url, $db_type, $db_prefix, $db_user, $db_pass, $db_host, $db_path) { $db_types = drupal_detect_database_types(); if (count($db_types) == 0) { $form['no_db_types'] = array( |