diff options
| author | Sam Tuke <samtuke@owncloud.com> | 2013-01-31 16:30:37 +0000 |
|---|---|---|
| committer | Sam Tuke <samtuke@owncloud.com> | 2013-01-31 16:30:37 +0000 |
| commit | 31e723a907399d7d33a0699da082164055f79b3e (patch) | |
| tree | 7da079cc3db0a46512da1b02cc19307337d9ce54 /lib/api.php | |
| parent | c7b1bdf00e65cca2a42d77fc5f27d0ea69e53be3 (diff) | |
| parent | 209d599ec5b00c5b92a33e902867fc621e725c93 (diff) | |
| download | nextcloud-server-31e723a907399d7d33a0699da082164055f79b3e.tar.gz nextcloud-server-31e723a907399d7d33a0699da082164055f79b3e.zip | |
Merge github.com:owncloud/core
Conflicts:
lib/public/share.php
Diffstat (limited to 'lib/api.php')
| -rw-r--r-- | lib/api.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/api.php b/lib/api.php index 0fce109a423..545b55757ff 100644 --- a/lib/api.php +++ b/lib/api.php @@ -90,6 +90,9 @@ class OC_API { if(self::isAuthorised(self::$actions[$name])) { if(is_callable(self::$actions[$name]['action'])) { $response = call_user_func(self::$actions[$name]['action'], $parameters); + if(!($response instanceof OC_OCS_Result)) { + $response = new OC_OCS_Result(null, 996, 'Internal Server Error'); + } } else { $response = new OC_OCS_Result(null, 998, 'Api method not found'); } |