summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-03-22 15:12:25 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-03-22 15:12:25 +0100
commitffe57a55d973e244fc84573323e3da8512e1ac95 (patch)
treeb7c1d59a5a1bd3e872bba780abbb831bafbbba22
parent0cd93a8e72b0c4eb57ad7488d62aa6179c08daad (diff)
parent24ce4b0f7d5cd63b0d74c5feae05c22fde769e18 (diff)
downloadnextcloud-server-ffe57a55d973e244fc84573323e3da8512e1ac95.tar.gz
nextcloud-server-ffe57a55d973e244fc84573323e3da8512e1ac95.zip
Merge pull request #23461 from owncloud/activity-491-autoloading-issue-without-sharing
Fix "AutoloadNotAllowedException" when files_sharing is disabled
-rw-r--r--lib/private/activitymanager.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/activitymanager.php b/lib/private/activitymanager.php
index 68bb8c13401..9258b7298cc 100644
--- a/lib/private/activitymanager.php
+++ b/lib/private/activitymanager.php
@@ -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;
}