summaryrefslogtreecommitdiffstats
path: root/apps/calendar/lib
diff options
context:
space:
mode:
authorGeorg Ehrke <dev@georgswebsite.de>2012-03-16 12:17:58 +0100
committerGeorg Ehrke <dev@georgswebsite.de>2012-03-16 12:17:58 +0100
commit27218f85cb54d543f3a5cf631785174193d0b42c (patch)
tree638f856a31deeb45da8fecdbe943aebe9376dc57 /apps/calendar/lib
parentc40668e3a90e3f9509931ac6226b01e57953ca7b (diff)
parent0fadbee69941efe7d08dc8533145046a9cccb76e (diff)
downloadnextcloud-server-27218f85cb54d543f3a5cf631785174193d0b42c.tar.gz
nextcloud-server-27218f85cb54d543f3a5cf631785174193d0b42c.zip
Merge branch 'master' into calendar_sharing
Diffstat (limited to 'apps/calendar/lib')
-rw-r--r--apps/calendar/lib/object.php11
1 files changed, 1 insertions, 10 deletions
diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index d52d7b180e7..898b3910140 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -96,8 +96,7 @@ class OC_Calendar_Object{
list($type,$startdate,$enddate,$summary,$repeating,$uid) = self::extractData($object);
if(is_null($uid)){
- $uid = self::createUID();
- $object->add('UID',$uid);
+ $object->setUID();
$data = $object->serialize();
}
@@ -209,14 +208,6 @@ class OC_Calendar_Object{
}
/**
- * @brief Creates a UID
- * @return string
- */
- protected static function createUID(){
- return substr(md5(rand().time()),0,10);
- }
-
- /**
* @brief Extracts data from a vObject-Object
* @param Sabre_VObject $object
* @return array