diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-11-02 22:36:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-02 22:36:05 +0100 |
| commit | 39573e602d5e38e4b71b3d197d08798dd9558659 (patch) | |
| tree | 1a4045bda8e05ad3537a9bf974834e1731a1e2cd /apps/files | |
| parent | 178d7f5bfa49bcf54d85ce788268ba592608627a (diff) | |
| parent | 7d17b42f4df2322c1078c99840a9d35415ffd7aa (diff) | |
| download | nextcloud-server-39573e602d5e38e4b71b3d197d08798dd9558659.tar.gz nextcloud-server-39573e602d5e38e4b71b3d197d08798dd9558659.zip | |
Merge pull request #1978 from nextcloud/remove-send-mail-option
Remove send mail option
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/lib/Controller/ViewController.php | 2 | ||||
| -rw-r--r-- | apps/files/templates/index.php | 2 | ||||
| -rw-r--r-- | apps/files/tests/Controller/ViewControllerTest.php | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php index d3708915273..6f74fec861f 100644 --- a/apps/files/lib/Controller/ViewController.php +++ b/apps/files/lib/Controller/ViewController.php @@ -235,8 +235,6 @@ class ViewController extends Controller { $params['owner'] = $storageInfo['owner']; $params['ownerDisplayName'] = $storageInfo['ownerDisplayName']; $params['isPublic'] = false; - $params['mailNotificationEnabled'] = $this->config->getAppValue('core', 'shareapi_allow_mail_notification', 'no'); - $params['mailPublicNotificationEnabled'] = $this->config->getAppValue('core', 'shareapi_allow_public_notification', 'no'); $params['allowShareWithLink'] = $this->config->getAppValue('core', 'shareapi_allow_links', 'yes'); $user = $this->userSession->getUser()->getUID(); $params['defaultFileSorting'] = $this->config->getUserValue($user, 'files', 'file_sorting', 'name'); diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index 17958d330b7..1670ccfd138 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -16,8 +16,6 @@ <input type="hidden" name="ownerDisplayName" id="ownerDisplayName" value="<?php p($_['ownerDisplayName']); ?>" /> <input type="hidden" name="fileNotFound" id="fileNotFound" value="<?php p($_['fileNotFound']); ?>" /> <?php if (!$_['isPublic']) :?> -<input type="hidden" name="mailNotificationEnabled" id="mailNotificationEnabled" value="<?php p($_['mailNotificationEnabled']) ?>" /> -<input type="hidden" name="mailPublicNotificationEnabled" id="mailPublicNotificationEnabled" value="<?php p($_['mailPublicNotificationEnabled']) ?>" /> <input type="hidden" name="allowShareWithLink" id="allowShareWithLink" value="<?php p($_['allowShareWithLink']) ?>" /> <input type="hidden" name="defaultFileSorting" id="defaultFileSorting" value="<?php p($_['defaultFileSorting']) ?>" /> <input type="hidden" name="defaultFileSortingDirection" id="defaultFileSortingDirection" value="<?php p($_['defaultFileSortingDirection']) ?>" /> diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php index 179aaa373b3..25445567ea9 100644 --- a/apps/files/tests/Controller/ViewControllerTest.php +++ b/apps/files/tests/Controller/ViewControllerTest.php @@ -218,8 +218,6 @@ class ViewControllerTest extends TestCase { 'defaultFileSortingDirection' => 'asc', 'showHiddenFiles' => 0, 'fileNotFound' => 0, - 'mailNotificationEnabled' => 'no', - 'mailPublicNotificationEnabled' => 'no', 'allowShareWithLink' => 'yes', 'appNavigation' => $nav, 'appContents' => [ |