diff options
| author | Dries Buytaert <dries@buytaert.net> | 2005-05-21 11:33:03 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2005-05-21 11:33:03 +0000 |
| commit | cdec2f7e3eb2f64c8d916b1d94f74462603eb884 (patch) | |
| tree | f83dbaf38aff03af82a5e9c08692df8be98cba9a /modules | |
| parent | 62427644ebc07c2be56153ffc2db012ced6eef7c (diff) | |
| download | brdo-cdec2f7e3eb2f64c8d916b1d94f74462603eb884.tar.gz brdo-cdec2f7e3eb2f64c8d916b1d94f74462603eb884.tar.bz2 | |
- Patch #16303 by Gerhard: fixed some warnings.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/system.module | 4 | ||||
| -rw-r--r-- | modules/system/system.module | 4 | ||||
| -rw-r--r-- | modules/user.module | 6 | ||||
| -rw-r--r-- | modules/user/user.module | 6 |
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; } /** |