From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 16 Sep 2013 08:42:37 +0000 (+0200)
Subject: Merge branch 'master' into encryption_improved_error_messages_4617
X-Git-Tag: v6.0.0alpha2~104^2~7
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=82cbbb8ab8cfe81559c45905d7fca819d71df346;p=nextcloud-server.git

Merge branch 'master' into encryption_improved_error_messages_4617

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

82cbbb8ab8cfe81559c45905d7fca819d71df346
diff --cc apps/files/index.php
index b81ba2bdde9,d46d8e32eef..5ef69a5d35e
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@@ -157,6 -132,7 +136,8 @@@ if ($needUpgrade) 
  	$tmpl->assign('isPublic', false);
  	$tmpl->assign('publicUploadEnabled', $publicUploadEnabled);
  	$tmpl->assign("encryptedFiles", \OCP\Util::encryptedFiles());
 +	$tmpl->assign("encryptionInitStatus", $encryptionInitStatus);
+ 	$tmpl->assign('disableSharing', false);
+ 	$tmpl->assign('ajaxLoad', $ajaxLoad);
  	$tmpl->printPage();
  }
diff --cc apps/files/templates/index.php
index e17273e47b1,bd991c3fcb0..2e4ca82c62f
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@@ -123,4 -116,3 +116,4 @@@
  <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="encryptedFiles" id="encryptionInitStatus" value="<?php p($_['encryptionInitStatus']) ?>" />
++<input type="hidden" name="encryptedFiles" id="encryptionInitStatus" value="<?php p($_['encryptionInitStatus']) ?>" />