summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-12-02 14:25:07 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2015-12-02 14:44:41 +0100
commit28ceab2f616d45a53dcc00c2cff53d5524bf0e9e (patch)
tree2c74c0dfb996625aad559e959c35860ba243770c /apps
parentf558ac7dd583c8135e40933e9e35d3505b9b6cb6 (diff)
downloadnextcloud-server-28ceab2f616d45a53dcc00c2cff53d5524bf0e9e.tar.gz
nextcloud-server-28ceab2f616d45a53dcc00c2cff53d5524bf0e9e.zip
Fix endless recursion
Diffstat (limited to 'apps')
-rw-r--r--apps/dav/lib/carddav/converter.php18
1 files changed, 15 insertions, 3 deletions
diff --git a/apps/dav/lib/carddav/converter.php b/apps/dav/lib/carddav/converter.php
index 67492378ade..56b73eba4c0 100644
--- a/apps/dav/lib/carddav/converter.php
+++ b/apps/dav/lib/carddav/converter.php
@@ -28,9 +28,10 @@ use Sabre\VObject\Property\Text;
class Converter {
- public function __construct() {
- }
-
+ /**
+ * @param IUser $user
+ * @return VCard
+ */
public function createCardFromUser(IUser $user) {
$uid = $user->getUID();
@@ -60,6 +61,11 @@ class Converter {
return $vCard;
}
+ /**
+ * @param VCard $vCard
+ * @param IUser $user
+ * @return bool
+ */
public function updateCard(VCard $vCard, IUser $user) {
$uid = $user->getUID();
$displayName = $user->getDisplayName();
@@ -105,6 +111,12 @@ class Converter {
return $updated;
}
+ /**
+ * @param VCard $vCard
+ * @param string $name
+ * @param string|IImage $newValue
+ * @return bool
+ */
private function propertyNeedsUpdate(VCard $vCard, $name, $newValue) {
if (is_null($newValue)) {
return false;