diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-04-26 17:54:49 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-04-26 17:54:49 +0000 |
| commit | 766b7691fa0823f47b7d103a936edcb4279a6f74 (patch) | |
| tree | a40d84f1fc2dd557092cef4a295c08f786c774e8 /includes | |
| parent | 90f598d522dd4b5eac0da1ea9f8f9f58b6bb31ef (diff) | |
| download | brdo-766b7691fa0823f47b7d103a936edcb4279a6f74.tar.gz brdo-766b7691fa0823f47b7d103a936edcb4279a6f74.tar.bz2 | |
#779494 follow-up by marcingy, tobiasb, aspilicious: Fixed Notices on install screens.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/theme.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/includes/theme.inc b/includes/theme.inc index e6c1f596d..da45df6dc 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -2105,8 +2105,10 @@ function _template_preprocess_default_variables() { 'logged_in' => FALSE, ); - // The user object has no uid property when the database does not exist. - if (isset($user->uid)) { + // The user object has no uid property when the database does not exist during + // install. The user_access() check deals with issues when in maintenance mode + // as uid is set but the user.module has not been included. + if (isset($user->uid) && function_exists('user_access')) { $variables['is_admin'] = user_access('access administration pages'); $variables['logged_in'] = ($user->uid > 0); } |