From cdec2f7e3eb2f64c8d916b1d94f74462603eb884 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sat, 21 May 2005 11:33:03 +0000
Subject: [PATCH] - Patch #16303 by Gerhard: fixed some warnings.
---
includes/bootstrap.inc | 2 +-
modules/system.module | 4 ++--
modules/system/system.module | 4 ++--
modules/user.module | 6 ++++--
modules/user/user.module | 6 ++++--
5 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 9e8b4d217d06..482c6fa6eae1 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -678,7 +678,7 @@ function arg($index) {
$arguments = explode('/', $_GET['q']);
}
- if ($arguments[$index] !== NULL) {
+ if (isset($arguments[$index])) {
return $arguments[$index];
}
}
diff --git a/modules/system.module b/modules/system.module
index b3c825378f6c..d9f6755177e6 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 b3c825378f6c..d9f6755177e6 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 5b80fc7f04c7..b84e738386cc 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 5b80fc7f04c7..b84e738386cc 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;
}
/**
--
GitLab