diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/common.inc | 2 | ||||
| -rw-r--r-- | includes/database.inc | 2 | ||||
| -rw-r--r-- | includes/file.inc | 2 | ||||
| -rw-r--r-- | includes/form.inc | 11 | ||||
| -rw-r--r-- | includes/image.inc | 2 | ||||
| -rw-r--r-- | includes/module.inc | 2 |
6 files changed, 11 insertions, 10 deletions
diff --git a/includes/common.inc b/includes/common.inc index 7c676e5e0..3c56472df 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -741,7 +741,7 @@ function format_rss_item($title, $link, $description, $args = array()) { if (is_array($value)) { if ($value['key']) { $output .= ' <'. $value['key']; - if (is_array($value['attributes'])) { + if (isset($value['attributes']) && is_array($value['attributes'])) { $output .= drupal_attributes($value['attributes']); } diff --git a/includes/database.inc b/includes/database.inc index 744284ece..2c3fe975b 100644 --- a/includes/database.inc +++ b/includes/database.inc @@ -232,7 +232,7 @@ function _db_rewrite_sql($query = '', $primary_table = 'n', $primary_field = 'ni $distinct = FALSE; foreach (module_implements('db_rewrite_sql') as $module) { $result = module_invoke($module, 'db_rewrite_sql', $query, $primary_table, $primary_field, $args); - if (is_array($result)) { + if (isset($result) && is_array($result)) { if (isset($result['where'])) { $where[] .= $result['where']; } diff --git a/includes/file.inc b/includes/file.inc index 95a08cb29..dbd981bb2 100644 --- a/includes/file.inc +++ b/includes/file.inc @@ -490,7 +490,7 @@ function file_download() { if ($headers === -1) { drupal_access_denied(); } - elseif (is_array($headers)) { + elseif (isset($headers) && is_array($headers)) { file_transfer($file, $headers); } } diff --git a/includes/form.inc b/includes/form.inc index fd1dc8482..3af3d1375 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -318,10 +318,11 @@ function _form_builder($form_id, $form) { * The rendered HTML form. */ function form_render(&$elements) { - $content = ''; - if (is_array($elements)) { - uasort($elements, "_form_sort"); + if (!isset($elements)) { + return NULL; } + $content = ''; + uasort($elements, "_form_sort"); if (!$elements['#children']) { /* render all the children using a theme function */ @@ -380,11 +381,11 @@ function _element_info($type, $refresh = null) { '#tree' => FALSE, '#parents' => $parents ); - if ($refresh || !is_array($cache)) { + if ($refresh || !isset($cache)) { $cache = array(); foreach (module_implements('elements') as $module) { $elements = module_invoke($module, 'elements'); - if (is_array($elements)) { + if (isset($elements) && is_array($elements)) { $cache = array_merge_recursive($cache, $elements); } } diff --git a/includes/image.inc b/includes/image.inc index a4cf79b44..cea0be011 100644 --- a/includes/image.inc +++ b/includes/image.inc @@ -89,7 +89,7 @@ function image_get_info($file) { $data = @getimagesize($file); $file_size = @filesize($file); - if (is_array($data)) { + if (isset($data) && is_array($data)) { $extensions = array('1' => 'gif', '2' => 'jpg', '3' => 'png'); $extension = array_key_exists($data[2], $extensions) ? $extensions[$data[2]] : ''; $details = array('width' => $data[0], diff --git a/includes/module.inc b/includes/module.inc index 748333a35..f4f590772 100644 --- a/includes/module.inc +++ b/includes/module.inc @@ -190,7 +190,7 @@ function module_invoke_all() { foreach (module_implements($hook) as $module) { $function = $module .'_'. $hook; $result = call_user_func_array($function, $args); - if (is_array($result)) { + if (isset($result) && is_array($result)) { $return = array_merge($return, $result); } else if (isset($result)) { |