1 files changed, 2 insertions, 14 deletions
diff --git a/apps/tasks/ajax/edittaskform.php b/apps/tasks/ajax/edittaskform.php
index b9c1f700b61..651c26c4986 100644
--- a/apps/tasks/ajax/edittaskform.php
+++ b/apps/tasks/ajax/edittaskform.php
@@ -8,19 +8,7 @@ OC_JSON::checkAppEnabled('tasks');
 $l10n = new OC_L10N('tasks');
 
 $id = $_GET['id'];
-$task = OC_Calendar_Object::find( $id );
-if( $task === false ){
-	OC_JSON::error(array('data' => array( 'message' => $l10n->t('Can not find Task!'))));
-	exit();
-}
-
-$calendar = OC_Calendar_Calendar::findCalendar( $task['calendarid'] );
-if( $calendar === false || $calendar['userid'] != OC_USER::getUser()){
-	OC_JSON::error(array('data' => array( 'message' => $l10n->t('This is not your task!'))));
-	exit();
-}
-
-$details = Sabre_VObject_Reader::read($task['calendardata'])->VTODO;
+$details = OC_Calendar_App::getVCalendar($id)->VTODO;
 $categories = array();
 if (isset($details->CATEGORIES)){
 	$categories = explode(',', $details->CATEGORIES->value);
@@ -35,7 +23,7 @@ $tmpl = new OC_Template('tasks','part.edittaskform');
 $tmpl->assign('category_options', $category_options);
 $tmpl->assign('percent_options', $percent_options);
 $tmpl->assign('priority_options', $priority_options);
-$tmpl->assign('task',$task);
+$tmpl->assign('id',$id);
 $tmpl->assign('details',$details);
 $tmpl->assign('categories', $categories);
 $page = $tmpl->fetchPage();