Skip to content

Commit

Permalink
[jan] Continue removing user data if a source doesn't have an __owner…
Browse files Browse the repository at this point in the history
… field.
  • Loading branch information
yunosh committed Aug 1, 2016
1 parent 1f6bd6d commit bbc06e1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions docs/CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
v4.2.16-git
-----------

[jan] Continue removing user data if a source doesn't have an __owner field.
[mjr] Fix over-agressive filtering of search results when searching via the API
(Bug #13945).

Expand Down
2 changes: 1 addition & 1 deletion lib/Driver/Sql.php
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ protected function _deleteAll($sourceName = null)
: array($sourceName);

if (empty($this->map['__owner'])) {
throw new Turba_Exception('Unable to find __owner field. Cannot delete.');
throw new Turba_Exception_NotSupported('Unable to find __owner field. Cannot delete.');
}
$owner_field = $this->map['__owner'];

Expand Down
2 changes: 2 additions & 0 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
</stability>
<license uri="http://www.horde.org/licenses/apache">ASL</license>
<notes>
* [jan] Continue removing user data if a source doesn&apos;t have an __owner field.
* [mjr] Fix over-agressive filtering of search results when searching via the API (Bug #13945).
</notes>
<contents>
Expand Down Expand Up @@ -2136,6 +2137,7 @@
<date>2016-07-01</date>
<license uri="http://www.horde.org/licenses/apache">ASL</license>
<notes>
* [jan] Continue removing user data if a source doesn&apos;t have an __owner field.
* [mjr] Fix over-agressive filtering of search results when searching via the API (Bug #13945).
</notes>
</release>
Expand Down

0 comments on commit bbc06e1

Please sign in to comment.