summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-04-13 10:30:31 +0200
committerMorris Jobke <hey@morrisjobke.de>2015-04-13 10:30:31 +0200
commitc3fbc2b6fd09bb5b94112da9248cae28d6ef85e3 (patch)
tree4cfed4ffef8eef8e9bdaa9defd3e22eb90cce331 /lib/private
parent0a72e66e9feaf555c485f312de1cd3377aeb6a9f (diff)
parent906b6b7337b7cd8922c0b1287f25bf03fff5c471 (diff)
downloadnextcloud-server-c3fbc2b6fd09bb5b94112da9248cae28d6ef85e3.tar.gz
nextcloud-server-c3fbc2b6fd09bb5b94112da9248cae28d6ef85e3.zip
Merge pull request #15563 from owncloud/fix-try-getting-propert-of-non-object-ocsclient
Prevent php message: "Trying to get property of non-object at /xxx/lib/p...
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/ocsclient.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php
index 84469cb5e0d..b00772fb799 100644
--- a/lib/private/ocsclient.php
+++ b/lib/private/ocsclient.php
@@ -262,6 +262,9 @@ class OCSClient {
}
$tmp = $data->data->content;
+ if (is_null($tmp)) {
+ return null;
+ }
$app = [];
$app['id'] = (int)$tmp->id;