stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-10 09:19:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

#2051 - Revise how Gallery_View returns combined JS and CSS.

Browse Source 
Changed Gallery_View's JS and CSS combining to:
- have get_combined() combine all groups if called without arguments.
- ensure the "core" group is combined first.
- always put links where get_combined() is called, even if combining is disabled (otherwise the order isn't preserved).
- add key as cache buster when combining is disabled.
- make "LOOKING FOR YOUR CSS/JAVASCRIPT..." comments in get_combined(), not in the theme itself.
Also, revised xss_data.txt golden file (line number changes only).
This commit is contained in:
shadlaws
2013-03-12 15:00:59 +01:00
parent cb8a63bb48
commit a1b5cf2e8d
4 changed files with 103 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
themes/admin_wind/views/admin.html.php
View File

@@ -47,10 +47,7 @@
media="screen,print,projection" />
<![endif]-->
<!-- LOOKING FOR YOUR CSS? It's all been combined into the link below -->
<?= $theme->get_combined("css") ?>
<!-- LOOKING FOR YOUR JAVASCRIPT? It's all been combined into the link below -->
<?= $theme->get_combined("script") ?>
</head>