From 77bf30e447e0183bd42d50add80e71944472b11d Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Wed, 28 Sep 2011 00:11:16 +0900
Subject: [PATCH] Issue #1000282 by sun, dixon_: reset argument missing for
comment_load[_multiple]().
---
modules/comment/comment.module | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index b52204ab3aaf..8100989d48eb 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -1633,6 +1633,9 @@ function comment_delete_multiple($cids) {
* values those fields must have. Instead, it is preferable to use
* EntityFieldQuery to retrieve a list of entity IDs loadable by
* this function.
+ * @param $reset
+ * Whether to reset the internal static entity cache. Note that the static
+ * cache is disabled in comment_entity_info() by default.
*
* @return
* An array of comment objects, indexed by comment ID.
@@ -1642,8 +1645,8 @@ function comment_delete_multiple($cids) {
*
* @todo Remove $conditions in Drupal 8.
*/
-function comment_load_multiple($cids = array(), $conditions = array()) {
- return entity_load('comment', $cids, $conditions);
+function comment_load_multiple($cids = array(), $conditions = array(), $reset = FALSE) {
+ return entity_load('comment', $cids, $conditions, $reset);
}
/**
@@ -1651,11 +1654,15 @@ function comment_load_multiple($cids = array(), $conditions = array()) {
*
* @param $cid
* The identifying comment id.
+ * @param $reset
+ * Whether to reset the internal static entity cache. Note that the static
+ * cache is disabled in comment_entity_info() by default.
+ *
* @return
* The comment object.
*/
-function comment_load($cid) {
- $comment = comment_load_multiple(array($cid));
+function comment_load($cid, $reset = FALSE) {
+ $comment = comment_load_multiple(array($cid), array(), $reset);
return $comment ? $comment[$cid] : FALSE;
}
--
GitLab