Merge r7497 from nihvivo-rel-1.2-maint
This commit is contained in:
parent
198c8293ce
commit
fe3bd563bc
3 changed files with 7 additions and 22 deletions
|
@ -407,9 +407,6 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
|
|||
|
||||
// Let the page template know which page it's processing.
|
||||
map.put("currentServlet", normalizeServletName(vreq.getServletPath().replaceFirst("/", "")));
|
||||
|
||||
// Allow template to send domain name to JavaScript (needed for AJAX calls)
|
||||
map.put("requestedPage", vreq.getRequestURL().toString());
|
||||
|
||||
// In template: ${now?date}, ${now?datetime}, ${now?time}
|
||||
map.put("now", new Date());
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue