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
Piwigo · Sep 18, 2012 · a12e006 · a12e006
1 parent a9b7abb
commit a12e006
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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>