bachir/popsu-d7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

security update core+modules

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2015-04-26 18:38:56 +02:00
parent 2f45ea820a
commit 7c96373038
1022 changed files with 30319 additions and 11259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/tracker/tracker.info
View File

@@ -5,3 +5,9 @@ package = Core
version = VERSION
core = 7.x
files[] = tracker.test
; Information added by Drupal.org packaging script on 2015-04-02
version = "7.36"
project = "drupal"
datestamp = "1427943826"

10
modules/tracker/tracker.module
View File

@@ -263,7 +263,7 @@ function _tracker_add($nid, $uid, $changed) {
))
->execute();
// Create or update the user-level data.
// Create or update the user-level data, first for the user posting.
db_merge('tracker_user')
->key(array(
'nid' => $nid,
@@ -274,6 +274,14 @@ function _tracker_add($nid, $uid, $changed) {
'published' => $node->status,
))
->execute();
// Update the times for all the other users tracking the post.
db_update('tracker_user')
->condition('nid', $nid)
->fields(array(
'changed' => $changed,
'published' => $node->status,
))
->execute();
}
/**

1
modules/tracker/tracker.pages.inc
View File

@@ -120,7 +120,6 @@ function tracker_page($account = NULL, $set_title = FALSE) {
);
$page['pager'] = array(
'#theme' => 'pager',
'#quantity' => 25,
'#weight' => 10,
);
$page['#sorted'] = TRUE;

108
modules/tracker/tracker.test
View File

@@ -59,14 +59,14 @@ class TrackerTest extends DrupalWebTestCase {
));
$this->drupalGet('tracker');
$this->assertNoText($unpublished->title, t('Unpublished node do not show up in the tracker listing.'));
$this->assertText($published->title, t('Published node show up in the tracker listing.'));
$this->assertLink(t('My recent content'), 0, t('User tab shows up on the global tracker page.'));
$this->assertNoText($unpublished->title, 'Unpublished node do not show up in the tracker listing.');
$this->assertText($published->title, 'Published node show up in the tracker listing.');
$this->assertLink(t('My recent content'), 0, 'User tab shows up on the global tracker page.');
// Delete a node and ensure it no longer appears on the tracker.
node_delete($published->nid);
$this->drupalGet('tracker');
$this->assertNoText($published->title, t('Deleted node do not show up in the tracker listing.'));
$this->assertNoText($published->title, 'Deleted node do not show up in the tracker listing.');
}
/**
@@ -102,10 +102,10 @@ class TrackerTest extends DrupalWebTestCase {
$this->drupalPost('comment/reply/' . $other_published_my_comment->nid, $comment, t('Save'));
$this->drupalGet('user/' . $this->user->uid . '/track');
$this->assertNoText($unpublished->title, t("Unpublished nodes do not show up in the users's tracker listing."));
$this->assertText($my_published->title, t("Published nodes show up in the user's tracker listing."));
$this->assertNoText($other_published_no_comment->title, t("Other user's nodes do not show up in the user's tracker listing."));
$this->assertText($other_published_my_comment->title, t("Nodes that the user has commented on appear in the user's tracker listing."));
$this->assertNoText($unpublished->title, "Unpublished nodes do not show up in the users's tracker listing.");
$this->assertText($my_published->title, "Published nodes show up in the user's tracker listing.");
$this->assertNoText($other_published_no_comment->title, "Other user's nodes do not show up in the user's tracker listing.");
$this->assertText($other_published_my_comment->title, "Nodes that the user has commented on appear in the user's tracker listing.");
// Verify that unpublished comments are removed from the tracker.
$admin_user = $this->drupalCreateUser(array('administer comments', 'access user profiles'));
@@ -128,19 +128,19 @@ class TrackerTest extends DrupalWebTestCase {
$node = $this->drupalCreateNode($edit);
$title = $edit['title'];
$this->drupalGet('tracker');
$this->assertPattern('/' . $title . '.*new/', t('New nodes are flagged as such in the tracker listing.'));
$this->assertPattern('/' . $title . '.*new/', 'New nodes are flagged as such in the tracker listing.');
$this->drupalGet('node/' . $node->nid);
$this->drupalGet('tracker');
$this->assertNoPattern('/' . $title . '.*new/', t('Visited nodes are not flagged as new.'));
$this->assertNoPattern('/' . $title . '.*new/', 'Visited nodes are not flagged as new.');
$this->drupalLogin($this->other_user);
$this->drupalGet('tracker');
$this->assertPattern('/' . $title . '.*new/', t('For another user, new nodes are flagged as such in the tracker listing.'));
$this->assertPattern('/' . $title . '.*new/', 'For another user, new nodes are flagged as such in the tracker listing.');
$this->drupalGet('node/' . $node->nid);
$this->drupalGet('tracker');
$this->assertNoPattern('/' . $title . '.*new/', t('For another user, visited nodes are not flagged as new.'));
$this->assertNoPattern('/' . $title . '.*new/', 'For another user, visited nodes are not flagged as new.');
}
/**
@@ -164,7 +164,7 @@ class TrackerTest extends DrupalWebTestCase {
$this->drupalLogin($this->other_user);
$this->drupalGet('tracker');
$this->assertText('1 new', t('New comments are counted on the tracker listing pages.'));
$this->assertText('1 new', 'New comments are counted on the tracker listing pages.');
$this->drupalGet('node/' . $node->nid);
// Add another comment as other_user.
@@ -179,7 +179,73 @@ class TrackerTest extends DrupalWebTestCase {
$this->drupalLogin($this->user);
$this->drupalGet('tracker');
$this->assertText('1 new', t('New comments are counted on the tracker listing pages.'));
$this->assertText('1 new', 'New comments are counted on the tracker listing pages.');
}
/**
* Tests for ordering on a users tracker listing when comments are posted.
*/
function testTrackerOrderingNewComments() {
$this->drupalLogin($this->user);
$node_one = $this->drupalCreateNode(array(
'title' => $this->randomName(8),
));
$node_two = $this->drupalCreateNode(array(
'title' => $this->randomName(8),
));
// Now get other_user to track these pieces of content.
$this->drupalLogin($this->other_user);
// Add a comment to the first page.
$comment = array(
'subject' => $this->randomName(),
'comment_body[' . LANGUAGE_NONE . '][0][value]' => $this->randomName(20),
);
$this->drupalPost('comment/reply/' . $node_one->nid, $comment, t('Save'));
// If the comment is posted in the same second as the last one then Drupal
// can't tell the difference, so we wait one second here.
sleep(1);
// Add a comment to the second page.
$comment = array(
'subject' => $this->randomName(),
'comment_body[' . LANGUAGE_NONE . '][0][value]' => $this->randomName(20),
);
$this->drupalPost('comment/reply/' . $node_two->nid, $comment, t('Save'));
// We should at this point have in our tracker for other_user:
// 1. node_two
// 2. node_one
// Because that's the reverse order of the posted comments.
// Now we're going to post a comment to node_one which should jump it to the
// top of the list.
$this->drupalLogin($this->user);
// If the comment is posted in the same second as the last one then Drupal
// can't tell the difference, so we wait one second here.
sleep(1);
// Add a comment to the second page.
$comment = array(
'subject' => $this->randomName(),
'comment_body[' . LANGUAGE_NONE . '][0][value]' => $this->randomName(20),
);
$this->drupalPost('comment/reply/' . $node_one->nid, $comment, t('Save'));
// Switch back to the other_user and assert that the order has swapped.
$this->drupalLogin($this->other_user);
$this->drupalGet('user/' . $this->other_user->uid . '/track');
// This is a cheeky way of asserting that the nodes are in the right order
// on the tracker page.
// It's almost certainly too brittle.
$pattern = '/' . preg_quote($node_one->title) . '.+' . preg_quote($node_two->title) . '/s';
$this->verbose($pattern);
$this->assertPattern($pattern, 'Most recently commented on node appears at the top of tracker');
}
/**
@@ -224,19 +290,19 @@ class TrackerTest extends DrupalWebTestCase {
// Assert that all node titles are displayed.
foreach ($nodes as $i => $node) {
$this->assertText($node->title, t('Node @i is displayed on the tracker listing pages.', array('@i' => $i)));
$this->assertText($node->title, format_string('Node @i is displayed on the tracker listing pages.', array('@i' => $i)));
}
$this->assertText('1 new', t('New comment is counted on the tracker listing pages.'));
$this->assertText('updated', t('Node is listed as updated'));
$this->assertText('1 new', 'New comment is counted on the tracker listing pages.');
$this->assertText('updated', 'Node is listed as updated');
// Fetch the site-wide tracker.
$this->drupalGet('tracker');
// Assert that all node titles are displayed.
foreach ($nodes as $i => $node) {
$this->assertText($node->title, t('Node @i is displayed on the tracker listing pages.', array('@i' => $i)));
$this->assertText($node->title, format_string('Node @i is displayed on the tracker listing pages.', array('@i' => $i)));
}
$this->assertText('1 new', t('New comment is counted on the tracker listing pages.'));
$this->assertText('1 new', 'New comment is counted on the tracker listing pages.');
}
/**
@@ -253,7 +319,7 @@ class TrackerTest extends DrupalWebTestCase {
// Assert that the node is displayed.
$this->drupalGet('tracker');
$this->assertText($node->title, t('Node is displayed on the tracker listing pages.'));
$this->assertText($node->title, 'Node is displayed on the tracker listing pages.');
// Unpublish the node and ensure that it's no longer displayed.
$edit = array(
@@ -263,6 +329,6 @@ class TrackerTest extends DrupalWebTestCase {
$this->drupalPost('admin/content', $edit, t('Update'));
$this->drupalGet('tracker');
$this->assertText(t('No content available.'), t('Node is displayed on the tracker listing pages.'));
$this->assertText(t('No content available.'), 'Node is displayed on the tracker listing pages.');
}
}