Skip to content

Add local version of escapeHTML - #23264

Merged
rullzer merged 1 commit into
masterfrom
bug/23177/escape-html
Oct 9, 2020
Merged

Add local version of escapeHTML#23264
rullzer merged 1 commit into
masterfrom
bug/23177/escape-html

Conversation

@kesselb

Copy link
Copy Markdown
Contributor

Fix#23177

Code taken from #22647

var$result=$('<span><div class="avatardiv"/><span>'+escapeHTML(element.displayname)+'</span></span>');

if(element.type==='group'){
return'<span title="'+escapeHTML(element.name)+'" class="group">'+escapeHTML(element.displayname+' '+t('files_external','(group)'))+'</span>';
}else{
return'<span title="'+escapeHTML(element.name)+'" class="user">'+escapeHTML(element.displayname)+'</span>';
}

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb
kesselbforce-pushed the bug/23177/escape-html branch from 59b6374 to d0f18f4CompareOctober 7, 2020 21:07
@kesselbkesselb added 3. to review Waiting for reviews bug labels Oct 7, 2020
@kesselb
kesselb requested review from blizzz and rullzerOctober 7, 2020 21:18
@faily-bot

faily-botBot commented Oct 7, 2020

Copy link
Copy Markdown

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 33817: failure

mysql8.0-php7.4

@rullzer

Copy link
Copy Markdown
Member

Ideally we mov e all this over to webpack. then we can just import it.... but for now sure I guess.

@rullzerrullzer added this to the Nextcloud 21 milestone Oct 8, 2020
@rullzer
rullzer merged commit 2ec160a into masterOct 9, 2020
@rullzer
rullzer deleted the bug/23177/escape-html branch October 9, 2020 07:25
@szaimen

Copy link
Copy Markdown
Contributor

Will this get backported to NC20?

@nickvergessen

Copy link
Copy Markdown
Member

/backport to stable20

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviewsbug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Select for users/groups in external storage ui does not work

4 participants

@kesselb@rullzer@szaimen@nickvergessen