diff options
-rw-r--r-- | includes/bootstrap.inc | 4 | ||||
-rw-r--r-- | modules/menu/menu.test | 5 | ||||
-rw-r--r-- | modules/node/tests/node_test_exception.module | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index 0b552e9e5..2cefd27cd 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -181,9 +181,9 @@ define('DRUPAL_KILOBYTE', 1024); /** * The language code used when no language is explicitly assigned. * - * Defined by ISO639-2 for "No linguistic content / Not applicable". + * Defined by ISO639-2 for "Undetermined". */ -define('LANGUAGE_NONE', 'zxx'); +define('LANGUAGE_NONE', 'und'); /** * The type of language used to define the content language. diff --git a/modules/menu/menu.test b/modules/menu/menu.test index 15fc84534..4396b4953 100644 --- a/modules/menu/menu.test +++ b/modules/menu/menu.test @@ -555,9 +555,10 @@ class MenuNodeTestCase extends DrupalWebTestCase { // Create a node. $node_title = $this->randomName(); + $language = LANGUAGE_NONE; $edit = array( - 'title[zxx][0][value]' => $node_title, - 'body[zxx][0][value]' => $this->randomString(), + "title[$language][0][value]" => $node_title, + "body[$language][0][value]" => $this->randomString(), ); $this->drupalPost('node/add/page', $edit, t('Save')); $node = $this->drupalGetNodeByTitle($node_title); diff --git a/modules/node/tests/node_test_exception.module b/modules/node/tests/node_test_exception.module index a8191a58c..c7edc8f24 100644 --- a/modules/node/tests/node_test_exception.module +++ b/modules/node/tests/node_test_exception.module @@ -11,7 +11,7 @@ * Implements hook_node_insert(). */ function node_test_exception_node_insert($node) { - if ($node->title['zxx'][0]['value'] == 'testing_transaction_exception') { + if ($node->title[LANGUAGE_NONE][0]['value'] == 'testing_transaction_exception') { throw new Exception('Test exception for rollback.'); } } |