Merge pull request #23461 from owncloud/activity-491-autoloading-issue-without-sharing

Fix "AutoloadNotAllowedException" when files_sharing is disabled
This commit is contained in:
Thomas Müller 2016-03-22 15:12:25 +01:00
commit ffe57a55d9
1 changed files with 2 additions and 2 deletions

View File

@ -256,11 +256,11 @@ class ActivityManager implements IManager {
foreach ($this->getExtensions() as $c) {
$result = $c->getNotificationTypes($languageCode);
if (is_array($result)) {
if (class_exists('\OCA\Files\Activity') && $c instanceof \OCA\Files\Activity) {
if (class_exists('\OCA\Files\Activity', false) && $c instanceof \OCA\Files\Activity) {
$filesNotificationTypes = $result;
continue;
}
if (class_exists('\OCA\Files_Sharing\Activity') && $c instanceof \OCA\Files_Sharing\Activity) {
if (class_exists('\OCA\Files_Sharing\Activity', false) && $c instanceof \OCA\Files_Sharing\Activity) {
$sharingNotificationTypes = $result;
continue;
}