0212771a65
- drop the kdelibs-4.1.1-bz#461725-regression.patch
15 lines
565 B
Diff
15 lines
565 B
Diff
Index: kutils/kemoticons/kemoticonstheme.cpp
|
|
===================================================================
|
|
--- kutils/kemoticons/kemoticonstheme.cpp (revision 860004)
|
|
+++ kutils/kemoticons/kemoticonstheme.cpp (revision 860005)
|
|
@@ -161,6 +161,9 @@
|
|
QString KEmoticonsTheme::parseEmoticons(const QString &text, ParseMode mode, const QStringList &exclude) const
|
|
{
|
|
QList<Token> tokens = tokenize(text, mode | SkipHTML);
|
|
+ if (tokens.isEmpty() && !text.isEmpty())
|
|
+ return text;
|
|
+
|
|
QString result;
|
|
|
|
foreach(const Token &token , tokens) {
|