- Patch #40631 by Chris Johnson: is_array() slower than isset() or empty().

1 files changed, 2 insertions, 2 deletions

diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index efca38ca5..c4dac7d36 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -1112,7 +1112,7 @@ function theme_comment_admin_overview($form) {
   $header = array(NULL, t('Subject'), t('Author'), t('Time'), t('Operations'));
 
   $output = form_render($form['options']);
-  if (is_array($form['subject'])) {
+  if (isset($form['subject']) && is_array($form['subject'])) {
     foreach (element_children($form['subject']) as $key) {
       $row = array();
       $row[] = form_render($form['comments'][$key]);
@@ -1657,7 +1657,7 @@ function comment_invoke_comment(&$comment, $op) {
   foreach (module_implements('comment') as $name) {
     $function = $name .'_comment';
     $result = $function($comment, $op);
-    if (is_array($result)) {
+    if (isset($result) && is_array($result)) {
       $return = array_merge($return, $result);
     }
     else if (isset($result)) {