gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Do not run FetchLinkCardService on local URLs, increase file size limit to 8MB,

Browse source 
fix ProcessFeedService pushing status into distribution if called a second time
while the first is still running (i.e. when a PuSH comes after a Salmon slap),
fix not running escape on spoiler text before emojify
This commit is contained in:
Eugen Rochko 2017-01-27 16:55:06 +01:00
parent 9f57c7d4a6
commit 450ad43180
5 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/components/components/status_content.jsx
View file

@ -1,5 +1,6 @@
import ImmutablePropTypes from 'react-immutable-proptypes';
import PureRenderMixin from 'react-addons-pure-render-mixin';
import escapeTextContentForBrowser from 'react/lib/escapeTextContentForBrowser';
import emojify from '../emoji';
import { FormattedMessage } from 'react-intl';
@ -96,7 +97,7 @@ const StatusContent = React.createClass({
const { hidden } = this.state;
const content = { __html: emojify(status.get('content')) };
const spoilerContent = { __html: emojify(status.get('spoiler_text', '')) };
const spoilerContent = { __html: emojify(escapeTextContentForBrowser(status.get('spoiler_text', ''))) };
if (status.get('spoiler_text').length > 0) {
const toggleText = hidden ? <FormattedMessage id='status.show_more' defaultMessage='Show more' /> : <FormattedMessage id='status.show_less' defaultMessage='Show less' />;