summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-02-04 10:55:49 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-02-04 10:55:49 +0100
commitb594aa18ee958c955f6f30bed3f446b2cd86cecd (patch)
treee69e1fc766a9c8a96900eb19694f691ed69651fa /lib/private
parentd3c86bdd67972576e2b3849a55f1b1295a5b8dd8 (diff)
parent9370491822dd6aca5dfa0b2d15a3c34d4f035566 (diff)
downloadnextcloud-server-b594aa18ee958c955f6f30bed3f446b2cd86cecd.tar.gz
nextcloud-server-b594aa18ee958c955f6f30bed3f446b2cd86cecd.zip
Merge pull request #22110 from owncloud/comment-types-always-plural
types shall always be plural
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/comments/comment.php4
-rw-r--r--lib/private/comments/manager.php6
-rw-r--r--lib/private/user/user.php2
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/private/comments/comment.php b/lib/private/comments/comment.php
index 75964603f9f..36189d9523b 100644
--- a/lib/private/comments/comment.php
+++ b/lib/private/comments/comment.php
@@ -242,7 +242,7 @@ class Comment implements IComment {
/**
* sets (overwrites) the actor type and id
*
- * @param string $actorType e.g. 'user'
+ * @param string $actorType e.g. 'users'
* @param string $actorId e.g. 'zombie234'
* @return IComment
* @since 9.0.0
@@ -328,7 +328,7 @@ class Comment implements IComment {
/**
* sets (overwrites) the object of the comment
*
- * @param string $objectType e.g. 'file'
+ * @param string $objectType e.g. 'files'
* @param string $objectId e.g. '16435'
* @return IComment
* @since 9.0.0
diff --git a/lib/private/comments/manager.php b/lib/private/comments/manager.php
index 28bd3b0916a..0cacc1cce71 100644
--- a/lib/private/comments/manager.php
+++ b/lib/private/comments/manager.php
@@ -384,7 +384,7 @@ class Manager implements ICommentsManager {
* saved in the used data storage. Use save() after setting other fields
* of the comment (e.g. message or verb).
*
- * @param string $actorType the actor type (e.g. 'user')
+ * @param string $actorType the actor type (e.g. 'users')
* @param string $actorId a user id
* @param string $objectType the object type the comment is attached to
* @param string $objectId the object id the comment is attached to
@@ -533,7 +533,7 @@ class Manager implements ICommentsManager {
* removes references to specific actor (e.g. on user delete) of a comment.
* The comment itself must not get lost/deleted.
*
- * @param string $actorType the actor type (e.g. 'user')
+ * @param string $actorType the actor type (e.g. 'users')
* @param string $actorId a user id
* @return boolean
* @since 9.0.0
@@ -560,7 +560,7 @@ class Manager implements ICommentsManager {
/**
* deletes all comments made of a specific object (e.g. on file delete)
*
- * @param string $objectType the object type (e.g. 'file')
+ * @param string $objectType the object type (e.g. 'files')
* @param string $objectId e.g. the file id
* @return boolean
* @since 9.0.0
diff --git a/lib/private/user/user.php b/lib/private/user/user.php
index 5e556575118..516c1d443c6 100644
--- a/lib/private/user/user.php
+++ b/lib/private/user/user.php
@@ -210,7 +210,7 @@ class User implements IUser {
// Delete the users entry in the storage table
\OC\Files\Cache\Storage::remove('home::' . $this->uid);
- \OC::$server->getCommentsManager()->deleteReferencesOfActor('user', $this->uid);
+ \OC::$server->getCommentsManager()->deleteReferencesOfActor('users', $this->uid);
\OC::$server->getCommentsManager()->deleteReadMarksFromUser($this);
}