stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-06-16 23:19:53 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Put the theme CSS at the end of the module CSS so that the theme has

Browse Source 
the final say.  Fixes ticket #1315.
This commit is contained in:
Bharat Mediratta
2010-08-29 21:15:58 -07:00
parent 2c717b18d3
commit ab598b2931
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/gallery/libraries/Theme_View.php
View File

@@ -236,6 +236,13 @@ class Theme_View_Core extends Gallery_View {
case "thumb_bottom":
case "thumb_info":
case "thumb_top":
if ($function == "head") {
// Stash any CSS we have already; that came from the theme and we want theme CSS to
// override module CSs
$save_css = $this->css;
$this->css = array();
}
$blocks = array();
if (method_exists("gallery_theme", $function)) {
switch (count($args)) {
@@ -275,6 +282,8 @@ class Theme_View_Core extends Gallery_View {
}
if ($function == "head") {
// Merge the theme CSS/JS at the end
$this->css = array_merge($this->css, $save_css);
array_unshift($blocks, $this->combine_files($this->css, "css"));
array_unshift($blocks, $this->combine_files($this->scripts, "javascript"));
}