4 files changed, 12 insertions, 8 deletions
diff --git a/modules/system.module b/modules/system.module
index b3c825378..d9f675517 100644
--- a/modules/system.module
+++ b/modules/system.module
@@ -288,9 +288,9 @@ function system_get_files_database(&$files, $type) {
   // Extract current files from database.
   $result = db_query("SELECT name, type, status, throttle FROM {system} WHERE type = '%s'", $type);
   while ($file = db_fetch_object($result)) {
-    if (is_object($files[$file->name])) {
+    if (isset($files[$file->name]) && is_object($files[$file->name])) {
       foreach ($file as $key => $value) {
-        if (!$files[$file->name]->$key) {
+        if (!isset($files[$file->name]) || !isset($files[$file->name]->$key)) {
           $files[$file->name]->$key = $value;
         }
       }
diff --git a/modules/system/system.module b/modules/system/system.module
index b3c825378..d9f675517 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -288,9 +288,9 @@ function system_get_files_database(&$files, $type) {
   // Extract current files from database.
   $result = db_query("SELECT name, type, status, throttle FROM {system} WHERE type = '%s'", $type);
   while ($file = db_fetch_object($result)) {
-    if (is_object($files[$file->name])) {
+    if (isset($files[$file->name]) && is_object($files[$file->name])) {
       foreach ($file as $key => $value) {
-        if (!$files[$file->name]->$key) {
+        if (!isset($files[$file->name]) || !isset($files[$file->name]->$key)) {
           $files[$file->name]->$key = $value;
         }
       }
diff --git a/modules/user.module b/modules/user.module
index 5b80fc7f0..b84e73838 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -332,8 +332,10 @@ function user_access($string, $account = NULL) {
       $perm[$account->uid] .= "$row->perm, ";
     }
   }
-
-  return strstr($perm[$account->uid], "$string, ");
+  if (isset($perm[$account->uid])) {
+    return strstr($perm[$account->uid], "$string, ");
+  }
+  return FALSE;
 }
 
 /**
diff --git a/modules/user/user.module b/modules/user/user.module
index 5b80fc7f0..b84e73838 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -332,8 +332,10 @@ function user_access($string, $account = NULL) {
       $perm[$account->uid] .= "$row->perm, ";
     }
   }
-
-  return strstr($perm[$account->uid], "$string, ");
+  if (isset($perm[$account->uid])) {
+    return strstr($perm[$account->uid], "$string, ");
+  }
+  return FALSE;
 }
 
 /**