From 766b7691fa0823f47b7d103a936edcb4279a6f74 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Mon, 26 Apr 2010 17:54:49 +0000
Subject: [PATCH] #779494 follow-up by marcingy, tobiasb, aspilicious: Fixed
Notices on install screens.
---
includes/theme.inc | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/includes/theme.inc b/includes/theme.inc
index e6c1f596d69d..da45df6dc5dc 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);
}
--
GitLab