Skip to content

Commit

Permalink
Revert "Actually return object hash and UIDs (Bug #13269)."
Browse files Browse the repository at this point in the history
This reverts commit 395502d.
  • Loading branch information
yunosh committed Jun 30, 2014
1 parent c518eed commit ed05c75
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions mnemo/lib/Driver/Kolab.php
Expand Up @@ -133,11 +133,12 @@ public function getByUID($uid, $passphrase = null)
protected function _add($noteId, $desc, $body, $tags)
{
try {
return $this->_getData()
$this->_getData()
->create($this->_buildObject($noteId, $desc, $body, $tags));
} catch (Horde_Kolab_Storage_Exception $e) {
throw new Mnemo_Exception($e);
}
return $uid;
}

/**
Expand All @@ -154,11 +155,12 @@ protected function _add($noteId, $desc, $body, $tags)
protected function _modify($noteId, $desc, $body, $tags)
{
try {
return $this->_getData()
$this->_getData()
->modify($this->_buildObject($noteId, $desc, $body, $tags));
} catch (Horde_Kolab_Storage_Exception $e) {
throw new Mnemo_Exception($e);
}
return $uid;
}

/**
Expand All @@ -169,7 +171,7 @@ protected function _modify($noteId, $desc, $body, $tags)
* @param string $body The whole note body.
* @param string $tags The tags of the note.
*
* @return array The Kolab hash.
* @return string The Kolab hash.
*/
protected function _buildObject($noteId, $desc, $body, $tags)
{
Expand All @@ -183,8 +185,6 @@ protected function _buildObject($noteId, $desc, $body, $tags)
->getInstance('Mnemo_Tagger')
->split($tags);
usort($object['categories'], 'strcoll');

return $object;
}

/**
Expand Down

0 comments on commit ed05c75

Please sign in to comment.