summaryrefslogtreecommitdiff
path: root/modules/menu
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2010-01-09 21:54:01 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2010-01-09 21:54:01 +0000
commit147bb1389a18eca73015390cc46a5fe03abfcb88 (patch)
treec5798ac604e5fd2ded01f15db2f0e422b4077abb /modules/menu
parent364238c585cb3c2f64b99a385c577f174cdf1f39 (diff)
downloadbrdo-147bb1389a18eca73015390cc46a5fe03abfcb88.tar.gz
brdo-147bb1389a18eca73015390cc46a5fe03abfcb88.tar.bz2
#571654 follow-up by chx, peximo, plach, sun, et al:
Roll-back of node titles as fields. The Entity Translation module in contrib can add this back, but for everyone else it creates a *huge* WTF. Apologies for how late this is coming, but better now than post-alpha. :\
Diffstat (limited to 'modules/menu')
-rw-r--r--modules/menu/menu.module2
-rw-r--r--modules/menu/menu.test6
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index 7eaac9fb8..5f203a7f6 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -490,7 +490,7 @@ function menu_node_save($node) {
$link['link_path'] = "node/$node->nid";
// If not already set, use the node's title as link title attribute.
if (empty($link['options']['attributes']['title']) && !$link['customized']) {
- $link['options']['attributes']['title'] = trim($node->title[LANGUAGE_NONE][0]['value']);
+ $link['options']['attributes']['title'] = trim($node->title);
}
if (!menu_link_save($link)) {
drupal_set_message(t('There was an error saving the menu link.'), 'error');
diff --git a/modules/menu/menu.test b/modules/menu/menu.test
index e3efe094b..51dddb071 100644
--- a/modules/menu/menu.test
+++ b/modules/menu/menu.test
@@ -317,7 +317,7 @@ class MenuTestCase extends DrupalWebTestCase {
// Verify menu link link.
$this->clickLink($title);
- $title = $parent_node->title[LANGUAGE_NONE][0]['value'];
+ $title = $parent_node->title;
$this->assertTitle(t("@title | Drupal", array('@title' => $title)), t('Parent menu link link target was correct'));
}
@@ -327,7 +327,7 @@ class MenuTestCase extends DrupalWebTestCase {
// Verify menu link link.
$this->clickLink($title);
- $title = $item_node->title[LANGUAGE_NONE][0]['value'];
+ $title = $item_node->title;
$this->assertTitle(t("@title | Drupal", array('@title' => $title)), t('Menu link link target was correct'));
}
@@ -557,7 +557,7 @@ class MenuNodeTestCase extends DrupalWebTestCase {
$node_title = $this->randomName();
$language = LANGUAGE_NONE;
$edit = array(
- "title[$language][0][value]" => $node_title,
+ "title" => $node_title,
"body[$language][0][value]" => $this->randomString(),
);
$this->drupalPost('node/add/page', $edit, t('Save'));