Skip to content

Commit

Permalink
Remove auto detection of languages with highlightjs
Browse files Browse the repository at this point in the history
Fixes #7476

closes #7591
  • Loading branch information
svbergerem authored and SuperTux88 committed Aug 29, 2017
1 parent 2bb7d4e commit 98cccda
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
1 change: 1 addition & 0 deletions Changelog.md
Expand Up @@ -7,6 +7,7 @@
* Remove tiff support from photos [#7576](https://github.com/diaspora/diaspora/pull/7576)
* Remove reference from reshares when original post is deleted [#7578](https://github.com/diaspora/diaspora/pull/7578)
* Merge migrations from before 0.6.0.0 to CreateSchema [#7580](https://github.com/diaspora/diaspora/pull/7580)
* Remove auto detection of languages with highlightjs [#7591](https://github.com/diaspora/diaspora/pull/7591)

## Bug fixes
* Fix displaying polls with long answers [#7579](https://github.com/diaspora/diaspora/pull/7579)
Expand Down
4 changes: 0 additions & 4 deletions app/assets/javascripts/app/helpers/text_formatter.js
Expand Up @@ -71,10 +71,6 @@
} catch (__) {}
}

try {
return hljs.highlightAuto(str).value;
} catch (__) {}

return "";
}
});
Expand Down

0 comments on commit 98cccda

Please sign in to comment.