From 8e583f55dc683e9e936a7c6b94614410145dca8c Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 3 Jun 2014 11:29:28 +0200
Subject: [PATCH 1/2] set "allow users to send mail notification for shared
 files default" setting to "no" now that we have the activity app

---
 apps/files/index.php | 2 +-
 settings/admin.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files/index.php b/apps/files/index.php
index ba46866ab1..bc74e17aee 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -118,7 +118,7 @@ $tmpl = new OCP\Template('files', 'index', 'user');
 $tmpl->assign('usedSpacePercent', (int)$storageInfo['relative']);
 $tmpl->assign('isPublic', false);
 $tmpl->assign("encryptedFiles", \OCP\Util::encryptedFiles());
-$tmpl->assign("mailNotificationEnabled", $config->getAppValue('core', 'shareapi_allow_mail_notification', 'yes'));
+$tmpl->assign("mailNotificationEnabled", $config->getAppValue('core', 'shareapi_allow_mail_notification', 'no'));
 $tmpl->assign("allowShareWithLink", $config->getAppValue('core', 'shareapi_allow_links', 'yes'));
 $tmpl->assign("encryptionInitStatus", $encryptionInitStatus);
 $tmpl->assign('appNavigation', $nav);
diff --git a/settings/admin.php b/settings/admin.php
index a0769892ef..7b72266130 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -82,7 +82,7 @@ $tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links
 $tmpl->assign('enforceLinkPassword', \OCP\Util::isPublicLinkPasswordRequired());
 $tmpl->assign('allowPublicUpload', OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes'));
 $tmpl->assign('allowResharing', OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes'));
-$tmpl->assign('allowMailNotification', OC_Appconfig::getValue('core', 'shareapi_allow_mail_notification', 'yes'));
+$tmpl->assign('allowMailNotification', OC_Appconfig::getValue('core', 'shareapi_allow_mail_notification', 'no'));
 $tmpl->assign('sharePolicy', OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global'));
 $tmpl->assign('forms', array());
 foreach($forms as $form) {

From 5097bcc16d3dea2c4aa66699bbbb00b1734a2967 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 3 Jun 2014 11:29:51 +0200
Subject: [PATCH 2/2] improve settings name

---
 settings/templates/admin.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index cb57bc0ce7..d44b68239d 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -277,8 +277,7 @@ if (!$_['internetconnectionworking']) {
 			<td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('class="hidden"');?>>
 				<input type="checkbox" name="shareapi_allow_mail_notification" id="allowMailNotification"
 					   value="1" <?php if ($_['allowMailNotification'] === 'yes') print_unescaped('checked="checked"'); ?> />
-				<label for="allowMailNotification"><?php p($l->t('Allow mail notification'));?></label><br/>
-				<em><?php p($l->t('Allow users to send mail notification for shared files')); ?></em>
+				<label for="allowMailNotification"><?php p($l->t('Allow users to send mail notification for shared files'));?></label><br/>
 			</td>
 		</tr>
 		<tr>