From 9fedd987820577ccac8c59909ccdc76a445121f3 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Mon, 30 Aug 2010 06:26:45 +0000
Subject: #821560 by plach: Fixed Notices on the content administration page
 after removing a language.

---
 modules/node/node.admin.inc | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'modules/node')

diff --git a/modules/node/node.admin.inc b/modules/node/node.admin.inc
index d20f1983d..4214573b2 100644
--- a/modules/node/node.admin.inc
+++ b/modules/node/node.admin.inc
@@ -461,7 +461,7 @@ function node_admin_nodes() {
   $destination = drupal_get_destination();
   $options = array();
   foreach ($nodes as $node) {
-    $l_options = $node->language != LANGUAGE_NONE ? array('language' => $languages[$node->language]) : array();
+    $l_options = $node->language != LANGUAGE_NONE && isset($languages[$node->language]) ? array('language' => $languages[$node->language]) : array();
     $options[$node->nid] = array(
       'title' => array(
         'data' => array(
@@ -478,7 +478,12 @@ function node_admin_nodes() {
       'changed' => format_date($node->changed, 'short'),
     );
     if ($multilanguage) {
-      $options[$node->nid]['language'] = $node->language == LANGUAGE_NONE ? t('Language neutral') : t($languages[$node->language]->name);
+      if ($node->language == LANGUAGE_NONE || isset($languages[$node->language])) {
+        $options[$node->nid]['language'] = $node->language == LANGUAGE_NONE ? t('Language neutral') : t($languages[$node->language]->name);
+      }
+      else {
+        $options[$node->nid]['language'] = t('Undefined language (@langcode)', array('@langcode' => $node->language));
+      }
     }
     // Build a list of all the accessible operations for the current node.
     $operations = array();
-- 
cgit v1.2.3