rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-01 13:24:10 +01:00
Code Issues Releases Activity

Avoid "Undefined offset: 0"

Browse Source 
$addressBook is always an array. either empty or having one entry.

https://github.com/owncloud/contacts/issues/740
https://github.com/nerzhul/ocsms/issues/39
This commit is contained in:
Martin Rüegg 2015-02-13 04:25:48 +01:00
parent 992b427ac1
commit 95cdb64b14
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/backend/shared.php
View File

@ -87,8 +87,22 @@ class Shared extends Database {
// Not sure if I'm doing it wrongly, or if its supposed to return
// the info in an array?
$addressBook = (isset($addressBook['permissions']) ? $addressBook : $addressBook[0]);
// https://github.com/owncloud/core/blob/master/lib/private/share/share.php
// \-> getItemSharedWithBySource()
// \-> self::getItems()
// -> return array();
// or -> return formatResult();
// \-> https://github.com/owncloud/contacts/blob/master/lib/share/addressbook.php
// \-> formatItems()
// \--> which in turn also always returns an array
// thus $addressBook is an array. either empty or having one entry
if(count($addressBook) == 0) {
return null;
}
$addressBook = $addressBook[0];
if(!isset($addressBook['permissions'])) {
return null;
}