Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
cdec2f7e
Commit
cdec2f7e
authored
May 21, 2005
by
Dries
Browse files
- Patch
#16303
by Gerhard: fixed some warnings.
parent
62427644
Changes
5
Hide whitespace changes
Inline
Side-by-side
includes/bootstrap.inc
View file @
cdec2f7e
...
...
@@ -678,7 +678,7 @@ function arg($index) {
$arguments
=
explode
(
'/'
,
$_GET
[
'q'
]);
}
if
(
$arguments
[
$index
]
!==
NULL
)
{
if
(
isset
(
$arguments
[
$index
]
)
)
{
return
$arguments
[
$index
];
}
}
...
...
modules/system.module
View file @
cdec2f7e
...
...
@@ -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
;
}
}
...
...
modules/system/system.module
View file @
cdec2f7e
...
...
@@ -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
;
}
}
...
...
modules/user.module
View file @
cdec2f7e
...
...
@@ -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
;
}
/**
...
...
modules/user/user.module
View file @
cdec2f7e
...
...
@@ -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
;
}
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment