Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-02-05 02:17:12 +00:00 · 2018-02-05 02:17:12 +00:00 · 3405ea6dd9
parent e815d6803d 95c8232109
commit 3405ea6dd9
1 changed files with 1 additions and 1 deletions
--- a/app/javascript/mastodon/features/compose/containers/warning_container.js
+++ b/app/javascript/mastodon/features/compose/containers/warning_container.js
@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
 import { me } from '../../../initial_state';

-const APPROX_HASHTAG_RE = /(?:^|[^\/\)\w])#(\S+)/i;
+const APPROX_HASHTAG_RE = /(?:^|[^\/\)\w])#(\w*[a-zA-Z]\w*)/i;

 const mapStateToProps = state => ({
  needsLockWarning: state.getIn(['compose', 'privacy']) === 'private' && !state.getIn(['accounts', me, 'locked']),