From: Björn Schießle <schiessle@owncloud.com>
Date: Thu, 31 Jan 2013 09:55:59 +0000 (+0100)
Subject: fix merge conflict
X-Git-Tag: v5.0.0alpha1~166^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=54eeb8b8fcff13d29ae363e7ca5e6da707fdd6b7;p=nextcloud-server.git

fix merge conflict
---

54eeb8b8fcff13d29ae363e7ca5e6da707fdd6b7
diff --cc apps/files/index.php
index 7ac201c8732,d2cd76a7106..7e767cc8a4f
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@@ -97,19 -112,28 +112,29 @@@ if (\OC\Files\Filesystem::isSharable($d
  	$permissions |= OCP\PERMISSION_SHARE;
  }
  
- // information about storage capacities
- $storageInfo=OC_Helper::getStorageInfo();
+ if ($needUpgrade) {
+ 	OCP\Util::addscript('files', 'upgrade');
+ 	$tmpl = new OCP\Template('files', 'upgrade', 'user');
+ 	$tmpl->printPage();
+ } else {
+ 	// information about storage capacities
+ 	$storageInfo=OC_Helper::getStorageInfo();
+ 	$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir);
  
- $tmpl = new OCP\Template('files', 'index', 'user');
- $tmpl->assign('fileList', $list->fetchPage(), false);
- $tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage(), false);
- $tmpl->assign('dir', OC_Filesystem::normalizePath($dir));
- $tmpl->assign('isCreatable', OC_Filesystem::isCreatable($dir . '/'));
- $tmpl->assign('permissions', $permissions);
- $tmpl->assign('files', $files);
- $tmpl->assign('trash', \OCP\App::isEnabled('files_trashbin'));
- $tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
- $tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
- $tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
- $tmpl->assign('usedSpacePercent', (int)$storageInfo['relative']);
- $tmpl->printPage();
+ 	OCP\Util::addscript('files', 'fileactions');
+ 	OCP\Util::addscript('files', 'files');
+ 	OCP\Util::addscript('files', 'keyboardshortcuts');
+ 	$tmpl = new OCP\Template('files', 'index', 'user');
+ 	$tmpl->assign('fileList', $list->fetchPage(), false);
+ 	$tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage(), false);
+ 	$tmpl->assign('dir', \OC\Files\Filesystem::normalizePath($dir));
+ 	$tmpl->assign('isCreatable', \OC\Files\Filesystem::isCreatable($dir . '/'));
+ 	$tmpl->assign('permissions', $permissions);
+ 	$tmpl->assign('files', $files);
++	$tmpl->assign('trash', \OCP\App::isEnabled('files_trashbin'));
+ 	$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
+ 	$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
+ 	$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
+ 	$tmpl->assign('usedSpacePercent', (int)$storageInfo['relative']);
+ 	$tmpl->printPage();
 -}
++}