From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 4 Oct 2013 10:30:49 +0000 (+0200)
Subject: Merge branch 'master' into sharing_mail_notification_master
X-Git-Tag: v6.0.0alpha2~101^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=51295e9a6b9cd8e351132e988858b5d4bd223968;p=nextcloud-server.git

Merge branch 'master' into sharing_mail_notification_master

Conflicts:
	apps/files/index.php
	apps/files/templates/index.php
---

51295e9a6b9cd8e351132e988858b5d4bd223968
diff --cc apps/files/index.php
index 62e1438fc63,42eac209b23..8d877be8ac9
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@@ -133,9 -137,8 +137,10 @@@ if ($needUpgrade) 
  	$tmpl->assign('isPublic', false);
  	$tmpl->assign('publicUploadEnabled', $publicUploadEnabled);
  	$tmpl->assign("encryptedFiles", \OCP\Util::encryptedFiles());
 +	$tmpl->assign("mailNotificationEnabled", \OC_Appconfig::getValue('core', 'shareapi_allow_mail_notification', 'yes'));
+ 	$tmpl->assign("encryptionInitStatus", $encryptionInitStatus);
  	$tmpl->assign('disableSharing', false);
  	$tmpl->assign('ajaxLoad', $ajaxLoad);
 +
  	$tmpl->printPage();
  }
diff --cc apps/files/templates/index.php
index e578a1f563c,1c6cd267d85..7067b854f50
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@@ -116,4 -116,4 +116,5 @@@
  <input type="hidden" name="allowZipDownload" id="allowZipDownload" value="<?php p($_['allowZipDownload']); ?>" />
  <input type="hidden" name="usedSpacePercent" id="usedSpacePercent" value="<?php p($_['usedSpacePercent']); ?>" />
  <input type="hidden" name="encryptedFiles" id="encryptedFiles" value="<?php $_['encryptedFiles'] ? p('1') : p('0'); ?>" />
+ <input type="hidden" name="encryptedInitStatus" id="encryptionInitStatus" value="<?php p($_['encryptionInitStatus']) ?>" />
 +<input type="hidden" name="mailNotificationEnabled" id="mailNotificationEnabled" value="<?php p($_['mailNotificationEnabled']) ?>" />