summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/comment/comment.module6
-rw-r--r--modules/node/node.admin.inc2
-rw-r--r--modules/node/node.module8
-rw-r--r--modules/node/node.test36
-rw-r--r--modules/node/tests/node_test.module18
-rw-r--r--modules/simpletest/drupal_web_test_case.php6
-rw-r--r--modules/simpletest/tests/file.test6
-rw-r--r--modules/taxonomy/taxonomy.module27
-rw-r--r--modules/user/user.module19
9 files changed, 113 insertions, 15 deletions
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 96b399b77..b279ef324 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -1442,6 +1442,11 @@ function comment_save($comment) {
$comment->node_type = 'comment_node_' . $node->type;
}
+ // Load the stored entity, if any.
+ if (!empty($comment->cid) && !isset($comment->original)) {
+ $comment->original = entity_load_unchanged('comment', $comment->cid);
+ }
+
field_attach_presave('comment', $comment);
// Allow modules to alter the comment before saving.
@@ -1568,6 +1573,7 @@ function comment_save($comment) {
if ($comment->status == COMMENT_PUBLISHED) {
module_invoke_all('comment_publish', $comment);
}
+ unset($comment->original);
}
catch (Exception $e) {
$transaction->rollback('comment');
diff --git a/modules/node/node.admin.inc b/modules/node/node.admin.inc
index 02891de93..a86ffb6ff 100644
--- a/modules/node/node.admin.inc
+++ b/modules/node/node.admin.inc
@@ -288,6 +288,8 @@ function node_mass_update($nodes, $updates) {
*/
function _node_mass_update_helper($nid, $updates) {
$node = node_load($nid, NULL, TRUE);
+ // For efficiency manually save the original node before applying any changes.
+ $node->original = clone $node;
foreach ($updates as $name => $value) {
$node->$name = $value;
}
diff --git a/modules/node/node.module b/modules/node/node.module
index 44a2274d1..d7cc85d83 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1032,6 +1032,11 @@ function node_save($node) {
$transaction = db_transaction();
try {
+ // Load the stored entity, if any.
+ if (!empty($node->nid) && !isset($node->original)) {
+ $node->original = entity_load_unchanged('node', $node->nid);
+ }
+
field_attach_presave('node', $node);
global $user;
@@ -1135,6 +1140,9 @@ function node_save($node) {
// Clear internal properties.
unset($node->is_new);
+ unset($node->original);
+ // Clear the static loading cache.
+ entity_get_controller('node')->resetCache(array($node->nid));
// Ignore slave server temporarily to give time for the
// saved node to be propagated to the slave.
diff --git a/modules/node/node.test b/modules/node/node.test
index 27abb4f4a..c0b6096c2 100644
--- a/modules/node/node.test
+++ b/modules/node/node.test
@@ -1041,14 +1041,14 @@ class NodeSaveTestCase extends DrupalWebTestCase {
$changed = $node->changed;
node_save($node);
- $node = $this->drupalGetNodeByTitle($edit['title']);
+ $node = $this->drupalGetNodeByTitle($edit['title'], TRUE);
$this->assertEqual($node->created, $created, t('Updating a node preserves "created" timestamp.'));
// Programmatically set the timestamps using hook_node_presave.
$node->title = 'testing_node_presave';
node_save($node);
- $node = $this->drupalGetNodeByTitle('testing_node_presave');
+ $node = $this->drupalGetNodeByTitle('testing_node_presave', TRUE);
$this->assertEqual($node->created, 280299600, t('Saving a node uses "created" timestamp set in presave hook.'));
$this->assertEqual($node->changed, 979534800, t('Saving a node uses "changed" timestamp set in presave hook.'));
@@ -1071,10 +1071,40 @@ class NodeSaveTestCase extends DrupalWebTestCase {
$node->changed = 280299600;
node_save($node);
- $node = $this->drupalGetNodeByTitle($edit['title']);
+ $node = $this->drupalGetNodeByTitle($edit['title'], TRUE);
$this->assertEqual($node->created, 979534800, t('Updating a node uses user-set "created" timestamp.'));
$this->assertNotEqual($node->changed, 280299600, t('Updating a node doesn\'t use user-set "changed" timestamp.'));
}
+
+ /**
+ * Tests determing changes in hook_node_presave() and verifies the static node
+ * load cache is cleared upon save.
+ */
+ function testDeterminingChanges() {
+ // Initial creation.
+ $node = (object) array(
+ 'uid' => $this->web_user->uid,
+ 'type' => 'article',
+ 'title' => 'test_changes',
+ );
+ node_save($node);
+
+ // Update the node without applying changes.
+ node_save($node);
+ $this->assertEqual($node->title, 'test_changes', 'No changes have been determined.');
+
+ // Apply changes.
+ $node->title = 'updated';
+ node_save($node);
+
+ // The hook implementations node_test_node_presave() and
+ // node_test_node_update() determine changes and change the title.
+ $this->assertEqual($node->title, 'updated_presave_update', 'Changes have been determined.');
+
+ // Test the static node load cache to be cleared.
+ $node = node_load($node->nid);
+ $this->assertEqual($node->title, 'updated_presave', 'Static cache has been cleared.');
+ }
}
/**
diff --git a/modules/node/tests/node_test.module b/modules/node/tests/node_test.module
index c32bc1ec0..821f48ca1 100644
--- a/modules/node/tests/node_test.module
+++ b/modules/node/tests/node_test.module
@@ -131,4 +131,22 @@ function node_test_node_presave($node) {
// Drupal 1.0 release.
$node->changed = 979534800;
}
+ // Determine changes.
+ if (!empty($node->original) && $node->original->title == 'test_changes') {
+ if ($node->original->title != $node->title) {
+ $node->title .= '_presave';
+ }
+ }
+}
+
+/**
+ * Implements hook_node_update().
+ */
+function node_test_node_update($node) {
+ // Determine changes on update.
+ if (!empty($node->original) && $node->original->title == 'test_changes') {
+ if ($node->original->title != $node->title) {
+ $node->title .= '_update';
+ }
+ }
}
diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php
index e50adda62..514694160 100644
--- a/modules/simpletest/drupal_web_test_case.php
+++ b/modules/simpletest/drupal_web_test_case.php
@@ -799,12 +799,14 @@ class DrupalWebTestCase extends DrupalTestCase {
*
* @param title
* A node title, usually generated by $this->randomName().
+ * @param $reset
+ * (optional) Whether to reset the internal node_load() cache.
*
* @return
* A node object matching $title.
*/
- function drupalGetNodeByTitle($title) {
- $nodes = node_load_multiple(array(), array('title' => $title));
+ function drupalGetNodeByTitle($title, $reset = FALSE) {
+ $nodes = node_load_multiple(array(), array('title' => $title), $reset);
// Load the first node returned from the database.
$returned_node = reset($nodes);
return $returned_node;
diff --git a/modules/simpletest/tests/file.test b/modules/simpletest/tests/file.test
index 36a7170b2..c9577c6b2 100644
--- a/modules/simpletest/tests/file.test
+++ b/modules/simpletest/tests/file.test
@@ -1485,7 +1485,7 @@ class FileMoveTest extends FileHookTestCase {
$this->assertEqual($contents, file_get_contents($result->uri), t('Contents of file correctly written.'));
// Check that the correct hooks were called.
- $this->assertFileHooksCalled(array('move', 'update'));
+ $this->assertFileHooksCalled(array('move', 'load', 'update'));
// Make sure we got the same file back.
$this->assertEqual($source->fid, $result->fid, t("Source file id's' %fid is unchanged after move.", array('%fid' => $source->fid)));
@@ -1517,7 +1517,7 @@ class FileMoveTest extends FileHookTestCase {
$this->assertEqual($contents, file_get_contents($result->uri), t('Contents of file correctly written.'));
// Check that the correct hooks were called.
- $this->assertFileHooksCalled(array('move', 'update'));
+ $this->assertFileHooksCalled(array('move', 'load', 'update'));
// Compare the returned value to what made it into the database.
$this->assertFileUnchanged($result, file_load($result->fid, TRUE));
@@ -1891,7 +1891,7 @@ class FileSaveTest extends FileHookTestCase {
$resaved_file = file_save($saved_file);
// Check that the correct hooks were called.
- $this->assertFileHooksCalled(array('update'));
+ $this->assertFileHooksCalled(array('load', 'update'));
$this->assertEqual($resaved_file->fid, $saved_file->fid, t("The file ID of an existing file is not changed when updating the database."), 'File');
$this->assertTrue($resaved_file->timestamp >= $saved_file->timestamp, t("Timestamp didn't go backwards."), 'File');
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index fd473e226..a78436e15 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -388,9 +388,15 @@ function taxonomy_vocabulary_save($vocabulary) {
if (!empty($vocabulary->name)) {
$vocabulary->name = trim($vocabulary->name);
}
- // For existing vocabularies, make sure we can detect machine name changes.
- if (!empty($vocabulary->vid) && !isset($vocabulary->old_machine_name)) {
- $vocabulary->old_machine_name = db_query("SELECT machine_name FROM {taxonomy_vocabulary} WHERE vid = :vid", array(':vid' => $vocabulary->vid))->fetchField();
+ // Load the stored entity, if any.
+ if (!empty($vocabulary->vid)) {
+ if (!isset($vocabulary->original)) {
+ $vocabulary->original = entity_load_unchanged('taxonomy_vocabulary', $vocabulary->vid);
+ }
+ // Make sure machine name changes are easily detected.
+ // @todo: Remove in Drupal 8, as it is deprecated by directly reading from
+ // $vocabulary->original.
+ $vocabulary->old_machine_name = $vocabulary->original->machine_name;
}
if (!isset($vocabulary->module)) {
@@ -414,8 +420,9 @@ function taxonomy_vocabulary_save($vocabulary) {
module_invoke_all('entity_insert', $vocabulary, 'taxonomy_vocabulary');
}
+ unset($vocabulary->original);
cache_clear_all();
- entity_get_controller('taxonomy_vocabulary')->resetCache();
+ entity_get_controller('taxonomy_vocabulary')->resetCache(array($vocabulary->vid));
return $status;
}
@@ -441,14 +448,14 @@ function taxonomy_vocabulary_delete($vid) {
db_delete('taxonomy_vocabulary')
->condition('vid', $vid)
->execute();
-
+
field_attach_delete_bundle('taxonomy_term', $vocabulary->machine_name);
module_invoke_all('taxonomy_vocabulary_delete', $vocabulary);
module_invoke_all('entity_delete', $vocabulary, 'taxonomy_vocabulary');
-
+
cache_clear_all();
entity_get_controller('taxonomy_vocabulary')->resetCache();
-
+
return SAVED_DELETED;
}
catch (Exception $e) {
@@ -540,6 +547,11 @@ function taxonomy_term_save($term) {
$term->vocabulary_machine_name = $vocabulary->machine_name;
}
+ // Load the stored entity, if any.
+ if (!empty($term->tid) && !isset($term->original)) {
+ $term->original = entity_load_unchanged('taxonomy_term', $term->tid);
+ }
+
field_attach_presave('taxonomy_term', $term);
module_invoke_all('taxonomy_term_presave', $term);
@@ -593,6 +605,7 @@ function taxonomy_term_save($term) {
// Invoke the taxonomy hooks.
module_invoke_all("taxonomy_term_$op", $term);
module_invoke_all("entity_$op", $term, 'taxonomy_term');
+ unset($term->original);
return $status;
}
diff --git a/modules/user/user.module b/modules/user/user.module
index 67d8ee549..d01e70f58 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -405,6 +405,11 @@ function user_save($account, $edit = array(), $category = 'account') {
unset($edit['pass']);
}
+ // Load the stored entity, if any.
+ if (!empty($account->uid) && !isset($account->original)) {
+ $account->original = entity_load_unchanged('user', $account->uid);
+ }
+
// Presave field allowing changing of $edit.
$edit = (object) $edit;
field_attach_presave('user', $edit);
@@ -503,6 +508,10 @@ function user_save($account, $edit = array(), $category = 'account') {
// Refresh user object.
$user = user_load($account->uid, TRUE);
+ // Make the original, unchanged user account available to update hooks.
+ if (isset($account->original)) {
+ $user->original = $account->original;
+ }
// Send emails after we have the new user object.
if (isset($edit['status']) && $edit['status'] != $account->status) {
@@ -513,6 +522,7 @@ function user_save($account, $edit = array(), $category = 'account') {
user_module_invoke('update', $edit, $user, $category);
module_invoke_all('entity_update', $user, 'user');
+ unset($user->original);
}
else {
// Allow 'uid' to be set by the caller. There is no danger of writing an
@@ -3054,6 +3064,9 @@ function user_user_operations_block($accounts) {
foreach ($accounts as $account) {
// Skip blocking user if they are already blocked.
if ($account !== FALSE && $account->status == 1) {
+ // For efficiency manually save the original account before applying any
+ // changes.
+ $account->original = clone $account;
user_save($account, array('status' => 0));
}
}
@@ -3074,6 +3087,9 @@ function user_multiple_role_edit($accounts, $operation, $rid) {
// Skip adding the role to the user if they already have it.
if ($account !== FALSE && !isset($account->roles[$rid])) {
$roles = $account->roles + array($rid => $role_name);
+ // For efficiency manually save the original account before applying
+ // any changes.
+ $account->original = clone $account;
user_save($account, array('roles' => $roles));
}
}
@@ -3084,6 +3100,9 @@ function user_multiple_role_edit($accounts, $operation, $rid) {
// Skip removing the role from the user if they already don't have it.
if ($account !== FALSE && isset($account->roles[$rid])) {
$roles = array_diff($account->roles, array($rid => $role_name));
+ // For efficiency manually save the original account before applying
+ // any changes.
+ $account->original = clone $account;
user_save($account, array('roles' => $roles));
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-07 05:39:22 +0000