Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20180123.sql =================================================================== diff -u --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20180123.sql (revision 0) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20180123.sql (revision 7d2053d1d049adee30bd0c726fd94227b982c75f) @@ -0,0 +1,14 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; + +----------------------Put all sql statements below here------------------------- + +-- LDEV-4502 Redo change as it was lost in the sql merges +-- LDEV-2941 Enable the option "Open URL in pop-up" for the example URL by default +UPDATE tl_larsrc11_resource_item SET open_url_new_window=1 WHERE uid='1'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; \ No newline at end of file Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java =================================================================== diff -u -r1bf70a335f5b30a1907ccae506908b05374c6c8c -r7d2053d1d049adee30bd0c726fd94227b982c75f --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java (.../ViewItemAction.java) (revision 1bf70a335f5b30a1907ccae506908b05374c6c8c) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java (.../ViewItemAction.java) (revision 7d2053d1d049adee30bd0c726fd94227b982c75f) @@ -268,7 +268,7 @@ return (IResourceService) wac.getBean(ResourceConstants.RESOURCE_SERVICE); } - private static Pattern wikipediaPattern = Pattern.compile("wikipedia", + private static Pattern usePopupButtonForURL = Pattern.compile("wikipedia|google", Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE); private Object getReviewUrl(ResourceItem item, String sessionMapID, String mode, int itemIdx) { @@ -277,10 +277,10 @@ switch (type) { case ResourceConstants.RESOURCE_TYPE_URL: // See LDEV-1736 regarding wikipedia regex - Matcher matcher = wikipediaPattern.matcher(item.getUrl()); - boolean wikipediaInURL = matcher.find(); + Matcher matcher = usePopupButtonForURL.matcher(item.getUrl()); + boolean usePopup = matcher.find(); - if (item.isOpenUrlNewWindow() || wikipediaInURL) { + if (item.isOpenUrlNewWindow() || usePopup) { url = constructUrlOpenInNewWindow(item, sessionMapID, mode, itemIdx); } else { url = ResourceWebUtils.protocol(item.getUrl());