From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 7 Jan 2015 11:57:33 +0000 (+0100)
Subject: Merge pull request #12687 from owncloud/auto-escape-t-placeholders
X-Git-Tag: v8.0.0alpha2~35
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5ce295907fd9469905d561de71d83149a6c0f6c5;p=nextcloud-server.git

Merge pull request #12687 from owncloud/auto-escape-t-placeholders

Auto escape t placeholders
---

5ce295907fd9469905d561de71d83149a6c0f6c5
diff --cc apps/files/js/filesummary.js
index d69c5f1b53a,d3afc0239d1..65187276b2b
--- a/apps/files/js/filesummary.js
+++ b/apps/files/js/filesummary.js
@@@ -211,9 -180,9 +211,9 @@@
  				fileSize = '<td class="filesize">' + OC.Util.humanFileSize(summary.totalSize) + '</td>';
  			}
  
- 			var info = t('files', '{dirs} and {files}', infoVars);
+ 			var info = t('files', '{dirs} and {files}', infoVars, null, {'escape': false});
  
 -			var $summary = $('<td><span class="info">'+info+'</span></td>'+fileSize+'<td class="date"></td>');
 +			var $summary = $('<td><span class="info">'+info+'<span class="filter">'+filterInfo+'</span></span></td>'+fileSize+'<td class="date"></td>');
  
  			if (!this.summary.totalFiles && !this.summary.totalDirs) {
  				this.$el.addClass('hidden');