projects
/
acontent.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b06f528
)
skip the url conversion if the url is inside double quotes (") because this url could...
author
Cindy Li
<cli@ocad.ca>
Wed, 25 Aug 2010 14:44:09 +0000
(14:44 -0000)
committer
Cindy Li
<cli@ocad.ca>
Wed, 25 Aug 2010 14:44:09 +0000
(14:44 -0000)
docs/home/classes/ContentUtility.class.php
patch
|
blob
|
history
diff --git
a/docs/home/classes/ContentUtility.class.php
b/docs/home/classes/ContentUtility.class.php
index
2c3efbb
..
d66500e
100644
(file)
--- a/
docs/home/classes/ContentUtility.class.php
+++ b/
docs/home/classes/ContentUtility.class.php
@@
-303,7
+303,7
@@
class ContentUtility {
// Limited conversion: It doesn't cover the case when the stuff in front of the URL is not a word. For example:
\r
// <p>http://google.ca</p>
\r
// "http://google.ca"
\r
// Limited conversion: It doesn't cover the case when the stuff in front of the URL is not a word. For example:
\r
// <p>http://google.ca</p>
\r
// "http://google.ca"
\r
- $text = preg_replace('/(^|[\n ])([\w]*?
[\"]*
)((?<!(\[media\]))http(s)?:\/\/[\w]+[^ \,\"\n\r\t\)<]*)/is',
\r
+ $text = preg_replace('/(^|[\n ])([\w]*?)((?<!(\[media\]))http(s)?:\/\/[\w]+[^ \,\"\n\r\t\)<]*)/is',
\r
'$1$2<a href="$3">$3</a>', $text);
\r
\r
// convert email address to clickable URL that pops up "send email" interface with the address filled in
\r
'$1$2<a href="$3">$3</a>', $text);
\r
\r
// convert email address to clickable URL that pops up "send email" interface with the address filled in
\r