summaryrefslogtreecommitdiff
path: root/modules/system/system.module
diff options
context:
space:
mode:
Diffstat (limited to 'modules/system/system.module')
-rw-r--r--modules/system/system.module4
1 files changed, 2 insertions, 2 deletions
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;
}
}