diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-02-05 02:17:12 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-02-05 02:17:12 +0000 |
| commit | 3405ea6dd9fde38ba1044933fec2ec7fa909ea8c (patch) | |
| tree | 8f505bd350cdf42df8ef0708641c481194cce49f /app | |
| parent | e815d6803d3e7c607e8bb04a5a14048ab08e6508 (diff) | |
| parent | 95c8232109f5e59273de48858ede7fbe7ce63d58 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app')
| -rw-r--r-- | app/javascript/mastodon/features/compose/containers/warning_container.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/compose/containers/warning_container.js b/app/javascript/mastodon/features/compose/containers/warning_container.js index b9f280958..dbb80dfb0 100644 --- 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']), |