aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2012-09-18 08:40:01 +0000
committerplegall <plg@piwigo.org>2012-09-18 08:40:01 +0000
commita12e006c89bd43cbbd6c89d826506de8cc09c081 (patch)
tree18cbfdd176410c1dc221886ec8e4199bf8bac8a9
parenta9b7abbc4f026d8cdd9f37429ad3ed975843d535 (diff)
merge r17978 from branch 2.4 to trunk
bug 2748 fixed: make sure scripts.js is loaded when we need phpWGOpenWindow git-svn-id: http://piwigo.org/svn/trunk@17979 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--themes/default/template/picture.tpl1
1 files changed, 1 insertions, 0 deletions
diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl
index 4d316c004..616be3d5c 100644
--- a/themes/default/template/picture.tpl
+++ b/themes/default/template/picture.tpl
@@ -55,6 +55,7 @@ jQuery("#derivativeSwitchBox").on("mouseleave click", function() {
</a><br>
{/foreach}
{if isset($U_ORIGINAL)}
+ {combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
<a href="javascript:phpWGOpenWindow('{$U_ORIGINAL}','xxx','scrollbars=yes,toolbar=no,status=no,resizable=yes')" rel="nofollow">{'Original'|@translate}</a>
{/if}
</div>