holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix link activation to be able to handle the same link (or email address) multiple times in the content

Browse Source
This commit is contained in:
Nathan Gray 2014-03-12 18:28:47 +00:00
parent 46d4d3acce
commit 1c6abab9a8
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etemplate/js/et2_core_common.js
View File

@ -490,14 +490,15 @@ function et2_activateLinks(_content)
}
}
// Split the content string at the given position
var splitted = _content.split(_matches[0], 2);
// Split the content string at the given position(s)
// but we only handle the first occurence
var splitted = _content.split(_matches[0]);
// Push the not-matched part
if (splitted[0])
{
// activate the links of the left string
arr = arr.concat(et2_activateLinks(splitted[0]));
arr = arr.concat(et2_activateLinks(splitted.shift()));
}
// Call the callback function which converts the matches into an object
@ -505,7 +506,7 @@ function et2_activateLinks(_content)
_proc(_matches);
// Set the new working string to the right part
_content = splitted[1];
_content = splitted.join(_matches[0]);
}
}