Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java,v diff -u -r1.15 -r1.16 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java 17 Sep 2006 06:25:37 -0000 1.15 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java 21 May 2008 07:10:20 -0000 1.16 @@ -32,6 +32,8 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -230,12 +232,18 @@ return (IResourceService) wac.getBean(ResourceConstants.RESOURCE_SERVICE); } + private static Pattern wikipediaPattern = Pattern.compile("wikipedia", Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE); + private Object getReviewUrl(ResourceItem item, String sessionMapID) { short type = item.getType(); String url = null; switch (type) { case ResourceConstants.RESOURCE_TYPE_URL: - if(item.isOpenUrlNewWindow()){ + // See LDEV-1736 regarding wikipedia regex + Matcher matcher = wikipediaPattern.matcher(item.getUrl()); + boolean wikipediaInURL = matcher.find(); + + if(item.isOpenUrlNewWindow() || wikipediaInURL) { try { url = "/openUrlPopup.do?popupUrl=" + URLEncoder.encode(protocol(item.getUrl()), "UTF8") + "&title=" + URLEncoder.encode(item.getTitle(), "UTF8");