summaryrefslogtreecommitdiffstats
path: root/lib/public
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-03-31 22:21:50 +0200
committerMorris Jobke <hey@morrisjobke.de>2016-03-31 22:21:50 +0200
commit902abe33f5b1db6d5c2adffa27f305ebe561b12f (patch)
tree2a292079b2d86dd2a780a7bbd71ad1793da718a2 /lib/public
parent1256235dadf8a79b4b4d1874063e2df6f2504873 (diff)
parentf5beeec833ff500b9c5072728338d372820e903c (diff)
downloadnextcloud-server-902abe33f5b1db6d5c2adffa27f305ebe561b12f.tar.gz
nextcloud-server-902abe33f5b1db6d5c2adffa27f305ebe561b12f.zip
Merge pull request #23676 from owncloud/handle-null-return-getAppInfo
Properly handle return values of OC_App::getAppInfo()
Diffstat (limited to 'lib/public')
-rw-r--r--lib/public/app.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/public/app.php b/lib/public/app.php
index 032116eb43f..c3ba90cea41 100644
--- a/lib/public/app.php
+++ b/lib/public/app.php
@@ -112,7 +112,7 @@ class App {
* Read app metadata from the info.xml file
* @param string $app id of the app or the path of the info.xml file
* @param boolean $path (optional)
- * @return array
+ * @return array|null
* @since 4.0.0
*/
public static function getAppInfo( $app, $path=false ) {