holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix uncaught exception if Collabora is not configured or reachable

Browse Source
This commit is contained in:
Ralf Becker 2017-10-05 11:00:38 +02:00
parent 1868b40359
commit 6a3a944828
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/src/Storage/Merge.php
View File

@ -1867,9 +1867,15 @@ abstract class Merge
$documents = array(); $documents = array();
$editable_mimes = array(); $editable_mimes = array();
if ($export_limit == null) $export_limit = self::getExportLimit(); // check if there is a globalsetting if ($export_limit == null) $export_limit = self::getExportLimit(); // check if there is a globalsetting
if (class_exists('EGroupware\\collabora\\Bo') && $discovery = \EGroupware\collabora\Bo::discover()) try {
{ if (class_exists('EGroupware\\collabora\\Bo') && $discovery = \EGroupware\collabora\Bo::discover())
$editable_mimes = $discovery; {
$editable_mimes = $discovery;
}
}
catch (\Exception $e) {
unset($e);
// ignore failed discovery
} }
if ($default_doc && ($file = Api\Vfs::stat($default_doc))) // put default document on top if ($default_doc && ($file = Api\Vfs::stat($default_doc))) // put default document on top
{ {