From 02a35e24f6fdc39a3181fe2f8f252cf3a2b0dc0d Mon Sep 17 00:00:00 2001
From: dereine <dereine@99340.no-reply.drupal.org>
Date: Sun, 12 Aug 2012 19:10:25 +0200
Subject: [PATCH] Issue #1715458 by dawehner, damiankloip: Replace calls to
->title with label().
---
.../Tests/Style/PluginStyleJumpMenuTest.php | 2 +-
lib/Drupal/views/Tests/User/UserTestCase.php | 2 +-
lib/Drupal/views/Tests/WizardBasicTest.php | 16 ++++----
.../views/Tests/WizardItemsPerPageTest.php | 38 +++++++++----------
lib/Drupal/views/Tests/WizardSortingTest.php | 24 ++++++------
.../node/views_handler_argument_node_nid.inc | 6 +--
.../node/views_handler_argument_node_vid.inc | 16 ++++++--
.../views_plugin_argument_validate_node.inc | 8 ++--
modules/search.views.inc | 2 +-
.../user/views_handler_argument_user_uid.inc | 6 +--
10 files changed, 65 insertions(+), 55 deletions(-)
diff --git a/lib/Drupal/views/Tests/Style/PluginStyleJumpMenuTest.php b/lib/Drupal/views/Tests/Style/PluginStyleJumpMenuTest.php
index 2518a373b6c1..838783d65b91 100644
--- a/lib/Drupal/views/Tests/Style/PluginStyleJumpMenuTest.php
+++ b/lib/Drupal/views/Tests/Style/PluginStyleJumpMenuTest.php
@@ -31,7 +31,7 @@ public function setUp() {
$this->nodes['story'][] = $this->drupalCreateNode(array('type' => 'story'));
$this->nodes['story'][] = $this->drupalCreateNode(array('type' => 'story'));
- $this->nodeTitles = array($this->nodes['page'][0]->title, $this->nodes['page'][1]->title, $this->nodes['story'][0]->title, $this->nodes['story'][1]->title);
+ $this->nodeTitles = array($this->nodes['page'][0]->label(), $this->nodes['page'][1]->label(), $this->nodes['story'][0]->label(), $this->nodes['story'][1]->label());
}
diff --git a/lib/Drupal/views/Tests/User/UserTestCase.php b/lib/Drupal/views/Tests/User/UserTestCase.php
index 2d2f9b6f5e3d..3addf52e3887 100644
--- a/lib/Drupal/views/Tests/User/UserTestCase.php
+++ b/lib/Drupal/views/Tests/User/UserTestCase.php
@@ -48,7 +48,7 @@ public function testRelationship() {
$expected = array();
for ($i = 0; $i <= 1; $i++) {
$expected[$i] = array(
- 'node_title' => $this->nodes[$i]->title,
+ 'node_title' => $this->nodes[$i]->label(),
'users_uid' => $this->nodes[$i]->uid,
'users_name' => $this->users[$i]->name,
);
diff --git a/lib/Drupal/views/Tests/WizardBasicTest.php b/lib/Drupal/views/Tests/WizardBasicTest.php
index 516df720b150..7d95aeba62bd 100644
--- a/lib/Drupal/views/Tests/WizardBasicTest.php
+++ b/lib/Drupal/views/Tests/WizardBasicTest.php
@@ -62,8 +62,8 @@ function testViewsWizardAndListing() {
// it.
$this->assertUrl($view2['page[path]']);
$this->assertText($view2['page[title]']);
- $this->assertText($node1->title);
- $this->assertText($node2->title);
+ $this->assertText($node1->label());
+ $this->assertText($node2->label());
// Check if we have the feed.
$this->assertLinkByHref(url($view2['page[feed_properties][path]']));
@@ -72,9 +72,9 @@ function testViewsWizardAndListing() {
// The feed should have the same title and nodes as the page.
$this->assertText($view2['page[title]']);
$this->assertRaw(url('node/' . $node1->nid, array('absolute' => TRUE)));
- $this->assertText($node1->title);
+ $this->assertText($node1->label());
$this->assertRaw(url('node/' . $node2->nid, array('absolute' => TRUE)));
- $this->assertText($node2->title);
+ $this->assertText($node2->label());
// Go back to the views page and check if this view is there.
$this->drupalGet('admin/structure/views');
@@ -103,8 +103,8 @@ function testViewsWizardAndListing() {
// Make sure the view only displays the node we expect.
$this->assertUrl($view3['page[path]']);
$this->assertText($view3['page[title]']);
- $this->assertText($node1->title);
- $this->assertNoText($node2->title);
+ $this->assertText($node1->label());
+ $this->assertNoText($node2->label());
// Go back to the views page and check if this view is there.
$this->drupalGet('admin/structure/views');
@@ -122,8 +122,8 @@ function testViewsWizardAndListing() {
// Visit a random page (not the one that displays the view itself) and look
// for the expected node title in the block.
$this->drupalGet('user');
- $this->assertText($node1->title);
- $this->assertNoText($node2->title);
+ $this->assertText($node1->label());
+ $this->assertNoText($node2->label());
// Check if the export screen works.
$this->drupalGet('admin/structure/views/view/' . $view3['name'] . '/export');
diff --git a/lib/Drupal/views/Tests/WizardItemsPerPageTest.php b/lib/Drupal/views/Tests/WizardItemsPerPageTest.php
index c6a4fcc27d6b..4379d6ef6c56 100644
--- a/lib/Drupal/views/Tests/WizardItemsPerPageTest.php
+++ b/lib/Drupal/views/Tests/WizardItemsPerPageTest.php
@@ -57,16 +57,16 @@ function testItemsPerPage() {
$this->assertUrl($view['page[path]']);
$this->assertText($view['page[title]']);
$content = $this->drupalGetContent();
- $this->assertText($node5->title);
- $this->assertText($node4->title);
- $this->assertText($node3->title);
- $this->assertText($node2->title);
- $this->assertNoText($node1->title);
- $this->assertNoText($page_node->title);
- $pos5 = strpos($content, $node5->title);
- $pos4 = strpos($content, $node4->title);
- $pos3 = strpos($content, $node3->title);
- $pos2 = strpos($content, $node2->title);
+ $this->assertText($node5->label());
+ $this->assertText($node4->label());
+ $this->assertText($node3->label());
+ $this->assertText($node2->label());
+ $this->assertNoText($node1->label());
+ $this->assertNoText($page_node->label());
+ $pos5 = strpos($content, $node5->label());
+ $pos4 = strpos($content, $node4->label());
+ $pos3 = strpos($content, $node3->label());
+ $pos2 = strpos($content, $node2->label());
$this->assertTrue($pos5 < $pos4 && $pos4 < $pos3 && $pos3 < $pos2, t('The nodes appear in the expected order in the page display.'));
// Put the block into the first sidebar region, visit a page that displays
@@ -79,15 +79,15 @@ function testItemsPerPage() {
$this->drupalPost('admin/structure/block', $edit, t('Save blocks'));
$this->drupalGet('user');
$content = $this->drupalGetContent();
- $this->assertText($node5->title);
- $this->assertText($node4->title);
- $this->assertText($node3->title);
- $this->assertNoText($node2->title);
- $this->assertNoText($node1->title);
- $this->assertNoText($page_node->title);
- $pos5 = strpos($content, $node5->title);
- $pos4 = strpos($content, $node4->title);
- $pos3 = strpos($content, $node3->title);
+ $this->assertText($node5->label());
+ $this->assertText($node4->label());
+ $this->assertText($node3->label());
+ $this->assertNoText($node2->label());
+ $this->assertNoText($node1->label());
+ $this->assertNoText($page_node->label());
+ $pos5 = strpos($content, $node5->label());
+ $pos4 = strpos($content, $node4->label());
+ $pos3 = strpos($content, $node3->label());
$this->assertTrue($pos5 < $pos4 && $pos4 < $pos3, t('The nodes appear in the expected order in the block display.'));
}
}
diff --git a/lib/Drupal/views/Tests/WizardSortingTest.php b/lib/Drupal/views/Tests/WizardSortingTest.php
index 1775988b13c1..34090ff2fbd1 100644
--- a/lib/Drupal/views/Tests/WizardSortingTest.php
+++ b/lib/Drupal/views/Tests/WizardSortingTest.php
@@ -44,12 +44,12 @@ function testSorting() {
$this->assertUrl($view1['page[path]']);
$this->assertText($view1['page[title]']);
$content = $this->drupalGetContent();
- $this->assertText($node1->title);
- $this->assertText($node2->title);
- $this->assertText($node3->title);
- $pos1 = strpos($content, $node1->title);
- $pos2 = strpos($content, $node2->title);
- $pos3 = strpos($content, $node3->title);
+ $this->assertText($node1->label());
+ $this->assertText($node2->label());
+ $this->assertText($node3->label());
+ $pos1 = strpos($content, $node1->label());
+ $pos2 = strpos($content, $node2->label());
+ $pos3 = strpos($content, $node3->label());
$this->assertTrue($pos1 < $pos2 && $pos2 < $pos3, t('The nodes appear in the expected order in a view that sorts by oldest first.'));
// Create a view that sorts newest first.
@@ -67,12 +67,12 @@ function testSorting() {
$this->assertUrl($view2['page[path]']);
$this->assertText($view2['page[title]']);
$content = $this->drupalGetContent();
- $this->assertText($node3->title);
- $this->assertText($node2->title);
- $this->assertText($node1->title);
- $pos3 = strpos($content, $node3->title);
- $pos2 = strpos($content, $node2->title);
- $pos1 = strpos($content, $node1->title);
+ $this->assertText($node3->label());
+ $this->assertText($node2->label());
+ $this->assertText($node1->label());
+ $pos3 = strpos($content, $node3->label());
+ $pos2 = strpos($content, $node2->label());
+ $pos1 = strpos($content, $node1->label());
$this->assertTrue($pos3 < $pos2 && $pos2 < $pos1, t('The nodes appear in the expected order in a view that sorts by newest first.'));
}
}
diff --git a/modules/node/views_handler_argument_node_nid.inc b/modules/node/views_handler_argument_node_nid.inc
index b0dbee09667f..d951f88c6d0b 100644
--- a/modules/node/views_handler_argument_node_nid.inc
+++ b/modules/node/views_handler_argument_node_nid.inc
@@ -15,9 +15,9 @@ class views_handler_argument_node_nid extends views_handler_argument_numeric {
function title_query() {
$titles = array();
- $result = db_query("SELECT n.title FROM {node} n WHERE n.nid IN (:nids)", array(':nids' => $this->value));
- foreach ($result as $term) {
- $titles[] = check_plain($term->title);
+ $nodes = node_load_multiple($this->value);
+ foreach ($nodes as $node) {
+ $titles[] = check_plain($node->label());
}
return $titles;
}
diff --git a/modules/node/views_handler_argument_node_vid.inc b/modules/node/views_handler_argument_node_vid.inc
index 21532f93d936..3e684af7d975 100644
--- a/modules/node/views_handler_argument_node_vid.inc
+++ b/modules/node/views_handler_argument_node_vid.inc
@@ -17,10 +17,20 @@ class views_handler_argument_node_vid extends views_handler_argument_numeric {
function title_query() {
$titles = array();
- $result = db_query("SELECT n.title FROM {node_revision} n WHERE n.nid IN (:nids)", array(':nids' => $this->value));
- foreach ($result as $term) {
- $titles[] = check_plain($term->title);
+ $results = db_query("SELECT nr.vid, nr.nid, nr.title FROM {node_revision} nr WHERE nr.vid IN (:vids)", array(':vids' => $this->value))->fetchAllAssoc('vid', PDO::FETCH_ASSOC);
+
+ $nids = array();
+ foreach ($results as $result) {
+ $nids[] = $result['nid'];
}
+
+ $nodes = node_load_multiple(array_unique($nids));
+
+ foreach ($results as $result) {
+ $nodes[$result['nid']]->set('title', $result['title']);
+ $titles[] = check_plain($nodes[$result['nid']]->label());
+ }
+
return $titles;
}
}
diff --git a/modules/node/views_plugin_argument_validate_node.inc b/modules/node/views_plugin_argument_validate_node.inc
index 868a621dcde1..1463a72c6637 100644
--- a/modules/node/views_plugin_argument_validate_node.inc
+++ b/modules/node/views_plugin_argument_validate_node.inc
@@ -96,7 +96,7 @@ function validate_argument($argument) {
}
// Save the title() handlers some work.
- $this->argument->validated_title = check_plain($node->title);
+ $this->argument->validated_title = check_plain($node->label());
if (empty($types)) {
return TRUE;
@@ -115,8 +115,8 @@ function validate_argument($argument) {
$test = drupal_map_assoc($nids->value);
$titles = array();
- $result = db_query("SELECT * FROM {node} WHERE nid IN (:nids)", array(':nids' => $nids->value));
- foreach ($result as $node) {
+ $nodes = node_load_multiple($nids->value);
+ foreach ($nodes as $node) {
if ($types && empty($types[$node->type])) {
return FALSE;
}
@@ -127,7 +127,7 @@ function validate_argument($argument) {
}
}
- $titles[] = check_plain($node->title);
+ $titles[] = check_plain($node->label());
unset($test[$node->nid]);
}
diff --git a/modules/search.views.inc b/modules/search.views.inc
index dad84bb7c120..71f8d8a4effa 100644
--- a/modules/search.views.inc
+++ b/modules/search.views.inc
@@ -182,7 +182,7 @@ function template_preprocess_views_view_row_search(&$vars) {
$node->body .= module_invoke('taxonomy', 'nodeapi', $node, 'update index');
$vars['url'] = url('node/' . $nid);
- $vars['title'] = check_plain($node->title);
+ $vars['title'] = check_plain($node->label());
$info = array();
$info['type'] = node_type_get_name($node);
diff --git a/modules/user/views_handler_argument_user_uid.inc b/modules/user/views_handler_argument_user_uid.inc
index 6ab9167d5233..c945565b7e19 100644
--- a/modules/user/views_handler_argument_user_uid.inc
+++ b/modules/user/views_handler_argument_user_uid.inc
@@ -24,9 +24,9 @@ function title_query() {
$titles = array();
- $result = db_query("SELECT u.name FROM {users} u WHERE u.uid IN (:uids)", array(':uids' => $this->value));
- foreach ($result as $term) {
- $titles[] = check_plain($term->name);
+ $users = user_load_multiple($this->value);
+ foreach ($users as $account) {
+ $titles[] = check_plain($account->label());
}
return $titles;
}
--
GitLab