Changeset 7428

Timestamp:

03/16/09 10:13:04 (17 months ago)

Author:

josowski

Message:

Made the regular expression for generating the "thisPage" variable a little less greedy.

References #1141

Files:

• head/ambra/webapp/src/main/webapp/global/global_header.ftl (modified) (1 diff)

head/ambra/webapp/src/main/webapp/global/global_header.ftl

@@ -25 +25 @@
   <@s.url id="thisPageURL" includeParams="get" includeContext="true" encode="false"/>
   <#-- remove duplicate articleURI specification, e.g. /article/doi?articleURL=doi -->
-  <#if thisPageURL?matches(r"^(/.+)?/article.+/info(:|%3A)doi(/|%2F).+")>
+  <#if thisPageURL?matches(r"^(/.+)?/article.*/info(:|%3A)doi(/|%2F).+")>
     <#assign thisPage = thisPageURL?replace(r"\??articleURI=info%3Adoi%2F.{30}", "", "r")?replace("&amp;", "&")?url>
   <#-- dont to anything if we're already on the feedbackCreate.action page -->