| Summary: | & replaces & in urls | ||
|---|---|---|---|
| Product: | [Applications] konversation | Reporter: | Torrie Fischer <tdfischer> |
| Component: | ircview | Assignee: | argonel <argonel> |
| Status: | RESOLVED FIXED | ||
| Severity: | normal | CC: | ehabkost |
| Priority: | NOR | ||
| Version First Reported In: | 0.19 | ||
| Target Milestone: | --- | ||
| Platform: | Fedora RPMs | ||
| OS: | Linux | ||
| Latest Commit: | Version Fixed/Implemented In: | ||
| Sentry Crash Report: | |||
|
Description
Torrie Fischer
2006-03-18 00:20:04 UTC
This problem happens here, also. However, only if the link contains a "#" character. If I someone types "#c&a" in a channel, for example, it is shown as "#c&a" in my chat window. SVN commit 557557 by hein:
* Fix handling of ampersands in URLs and channel links.
BUG:123819
* Remove stale code.
M +1 -1 common.cpp
M +0 -4 ircview.cpp
--- trunk/extragear/network/konversation/src/common.cpp #557556:557557
@@ -29,7 +29,7 @@
#include "unicode.cpp"
static QRegExp colorRegExp("((\003([0-9]|0[0-9]|1[0-5])(,([0-9]|0[0-9]|1[0-5])|)|\017)|\x02|\x09|\x13|\x16|\x1f)");
- static QRegExp urlPattern("((www\\.(?!\\.)|(fish|(f|ht)tp(|s))://)(\\.?[\\d\\w/,\\':~\\?=;#@\\-\\+\\%\\*\\{\\}\\!\\(\\)]|&)+)|"
+ static QRegExp urlPattern("((www\\.(?!\\.)|(fish|(f|ht)tp(|s))://)(\\.?[\\d\\w/,\\':~\\?=;#@\\-\\+\\%\\*\\{\\}\\!\\(\\)]|&)+)|"
"([-.\\d\\w]+@[-.\\d\\w]{2,}\\.[\\w]{2,})");
static QRegExp tdlPattern("(.*)\\.(\\w+),$");
--- trunk/extragear/network/konversation/src/ircview.cpp #557556:557557
@@ -332,7 +332,6 @@
KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp);
// TODO: Use QStyleSheet::escape() here
- filteredLine.replace("&","&");
// Replace all < with <
filteredLine.replace("<","<");
// Replace all > with >
@@ -400,9 +399,6 @@
filteredLine.replace(QRegExp("\003([^0-9]|$)"),"\0031,0\\1");
}
- // Hack to allow for whois info hostmask info to not be parsed as email
- filteredLine.replace("&#64;","@");
-
if(filteredLine.find("\x07") != -1)
{
if(Preferences::beep())
|