- Patch #8973 by JonBob: Drupal contains many undefined variables and array indices, which makes PHP throw a lot of warnings when the reporting level is set to E_ALL. Things run fine with these warnings, but as a matter of code style if nothing else we should probably strive to avoid them. The attached fixes most of the more egregious offenders (about 95% of the warnings when I load /node on my test site).

6 files changed, 6 insertions, 10 deletions

diff --git a/modules/help.module b/modules/help.module
index 6cfdce90c..f386c177a 100644
--- a/modules/help.module
+++ b/modules/help.module
@@ -47,10 +47,8 @@ function help_glossary() {
 function help_help($section) {
   switch ($section) {
     case 'admin/modules#description':
-      $output = t('Manages displaying online help.');
-      break;
+      return t('Manages displaying online help.');
   }
-  return $output;
 }
 
 /**
diff --git a/modules/help/help.module b/modules/help/help.module
index 6cfdce90c..f386c177a 100644
--- a/modules/help/help.module
+++ b/modules/help/help.module
@@ -47,10 +47,8 @@ function help_glossary() {
 function help_help($section) {
   switch ($section) {
     case 'admin/modules#description':
-      $output = t('Manages displaying online help.');
-      break;
+      return t('Manages displaying online help.');
   }
-  return $output;
 }
 
 /**
diff --git a/modules/node.module b/modules/node.module
index 3ea1aa664..7ec3e4c1e 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -620,7 +620,7 @@ function node_link($type, $node = 0, $main = 0) {
   $links = array();
 
   if ($type == 'node') {
-    if ($node->links) {
+    if (array_key_exists('links', $node)) {
       $links = $node->links;
     }
 
diff --git a/modules/node/node.module b/modules/node/node.module
index 3ea1aa664..7ec3e4c1e 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -620,7 +620,7 @@ function node_link($type, $node = 0, $main = 0) {
   $links = array();
 
   if ($type == 'node') {
-    if ($node->links) {
+    if (array_key_exists('links', $node)) {
       $links = $node->links;
     }
 
diff --git a/modules/taxonomy.module b/modules/taxonomy.module
index f8c4226e5..8bd8ba1f1 100644
--- a/modules/taxonomy.module
+++ b/modules/taxonomy.module
@@ -38,7 +38,7 @@ function taxonomy_perm() {
 function taxonomy_link($type, $node = NULL) {
   if ($type == 'taxonomy terms' && $node != NULL) {
     $links = array();
-    if ($node->taxonomy) {
+    if (array_key_exists('taxonomy', $node)) {
       foreach ($node->taxonomy as $tid) {
         $term = taxonomy_get_term($tid);
         $links[] = l($term->name, "taxonomy/page/or/$term->tid", $term->description ? array ('title' => $term->description) : array());
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index f8c4226e5..8bd8ba1f1 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -38,7 +38,7 @@ function taxonomy_perm() {
 function taxonomy_link($type, $node = NULL) {
   if ($type == 'taxonomy terms' && $node != NULL) {
     $links = array();
-    if ($node->taxonomy) {
+    if (array_key_exists('taxonomy', $node)) {
       foreach ($node->taxonomy as $tid) {
         $term = taxonomy_get_term($tid);
         $links[] = l($term->name, "taxonomy/page/or/$term->tid", $term->description ? array ('title' => $term->description) : array());