1
0
mirror of https://github.com/moodle/moodle.git synced 2025-03-22 16:40:07 +01:00

Merge branch 'MDL-77657-401-get_extra_scss_code-wrong-order' of https://github.com/danowar2k/moodle into MOODLE_401_STABLE

This commit is contained in:
Jun Pataleta 2023-08-31 17:50:56 +08:00
commit e3cee463b1
No known key found for this signature in database
GPG Key ID: F83510526D99E2C7
2 changed files with 3 additions and 3 deletions
lib
theme/boost

@ -1593,7 +1593,7 @@ class theme_config {
// Getting all the candidate functions.
$candidates = array();
foreach ($this->parent_configs as $parent_config) {
foreach (array_reverse($this->parent_configs) as $parent_config) {
if (!isset($parent_config->extrascsscallback)) {
continue;
}
@ -1626,7 +1626,7 @@ class theme_config {
// Getting all the candidate functions.
$candidates = array();
foreach ($this->parent_configs as $parent_config) {
foreach (array_reverse($this->parent_configs) as $parent_config) {
if (!isset($parent_config->prescsscallback)) {
continue;
}

@ -135,7 +135,7 @@ function theme_boost_get_precompiled_css() {
* Get SCSS to prepend.
*
* @param theme_config $theme The theme config object.
* @return array
* @return string
*/
function theme_boost_get_pre_scss($theme) {
global $CFG;