From: Georg Ehrke <developer@georgehrke.com>
Date: Mon, 5 Aug 2013 12:27:38 +0000 (+0200)
Subject: fix merge conflicts
X-Git-Tag: v6.0.0alpha2~235^2~45
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=af983b843d1335917f4a702cea6d91d28bab68e9;p=nextcloud-server.git

fix merge conflicts
---

af983b843d1335917f4a702cea6d91d28bab68e9
diff --cc apps/files_trashbin/templates/part.list.php
index 71b9a238823,254b08dd36a..6c6d2162846
--- a/apps/files_trashbin/templates/part.list.php
+++ b/apps/files_trashbin/templates/part.list.php
@@@ -22,14 -22,10 +22,14 @@@
  		data-dirlisting=0
  		<?php endif; ?>>
  		<td class="filename svg"
- 		<?php if($file['type'] == 'dir'): ?>
+ 		<?php if($file['type'] === 'dir'): ?>
  			style="background-image:url(<?php print_unescaped(OCP\mimetype_icon('dir')); ?>)"
  		<?php else: ?>
 -			style="background-image:url(<?php print_unescaped(OCP\mimetype_icon($file['mimetype'])); ?>)"
 +				<?php if(\OCP\Preview::isMimeSupported($file['mimetype'])): ?>
 +				style="background-image:url(<?php print_unescaped(OCA\Files_Trashbin\Trashbin::preview_icon(!$_['dirlisting'] ? ($file['name'].'.d'.$file['timestamp']) : ($file['directory'].'/'.$file['name']))); ?>)" class="preview-icon"
 +				<?php else: ?>
 +				style="background-image:url(<?php print_unescaped(OCP\mimetype_icon($file['mimetype'])); ?>)"
 +				<?php endif; ?>
  		<?php endif; ?>
  			>
  		<?php if(!isset($_['readonly']) || !$_['readonly']): ?><input type="checkbox" /><?php endif; ?>
diff --cc config/config.sample.php
index 50dec9e421e,24ba541ac5c..86bc20b714e
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@@ -187,13 -190,6 +190,15 @@@ $CONFIG = array
  'customclient_android' => '', //https://play.google.com/store/apps/details?id=com.owncloud.android
  'customclient_ios' => '', //https://itunes.apple.com/us/app/owncloud/id543672169?mt=8
  
 +// PREVIEW
 +/* the max width of a generated preview, if value is null, there is no limit */
 +'preview_max_x' => null,
 +/* the max height of a generated preview, if value is null, there is no limit */
 +'preview_max_y' => null,
 +/* the max factor to scale a preview, default is set to 10 */
 +'preview_max_scale_factor' => 10,
 +/* custom path for libreoffice / openoffice binary */
 +'preview_libreoffice_path' => '/usr/bin/libreoffice',
+ // date format to be used while writing to the owncloud logfile
 -'logdateformat' => 'F d, Y H:i:s'
++'logdateformat' => 'F d, Y H:i:s',
  );