diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/form.inc | 4 | ||||
| -rw-r--r-- | includes/session.inc | 2 |
2 files changed, 5 insertions, 1 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); |