mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

Better support for language styles

Browse Source
This commit is contained in:
moodler 2005-04-24 04:13:18 +00:00
parent 0bf465d203
commit 55b734fb84
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/weblib.php
View File

@ -1892,7 +1892,7 @@ function current_theme() {
* @param int $lifetime ? * @param int $lifetime ?
* @param string $thename ? * @param string $thename ?
*/ */
function style_sheet_setup($lastmodified=0, $lifetime=300, $themename='', $forceconfig='') { function style_sheet_setup($lastmodified=0, $lifetime=300, $themename='', $forceconfig='', $lang='') {
global $CFG, $THEME; global $CFG, $THEME;
@ -1979,7 +1979,6 @@ function style_sheet_setup($lastmodified=0, $lifetime=300, $themename='', $force
} }
if (!empty($THEME->langsheets)) { // Search for styles.php within the current language if (!empty($THEME->langsheets)) { // Search for styles.php within the current language
$lang = current_language();
if (file_exists($CFG->dirroot.'/lang/'.$lang.'/styles.php')) { if (file_exists($CFG->dirroot.'/lang/'.$lang.'/styles.php')) {
$files[] = array($CFG->dirroot, '/lang/'.$lang.'/styles.php'); $files[] = array($CFG->dirroot, '/lang/'.$lang.'/styles.php');
} }
@ -2019,6 +2018,10 @@ function theme_setup($theme = '', $params=NULL) {
$theme = current_theme(); $theme = current_theme();
} }
/// Load up the theme config
$THEME = NULL; // Just to be sure
include($CFG->themedir. $theme .'/config.php'); // Main config for current theme
/// Put together the parameters /// Put together the parameters
if (!$params) { if (!$params) {
$params = array(); $params = array();
@ -2026,16 +2029,19 @@ function theme_setup($theme = '', $params=NULL) {
if ($theme != $CFG->theme) { if ($theme != $CFG->theme) {
$params[] = 'forceconfig='.$theme; $params[] = 'forceconfig='.$theme;
} }
/// Force language too if required
if (!empty($THEME->langsheets)) {
$params[] = 'lang='.current_language();
}
/// Convert params to string
if ($params) { if ($params) {
$paramstring = '?'.implode('&', $params); $paramstring = '?'.implode('&', $params);
} else { } else {
$paramstring = ''; $paramstring = '';
} }
/// Load up the theme config
$THEME = NULL; // Just to be sure
include($CFG->themedir. $theme .'/config.php'); // Main config for current theme
/// Set up image paths /// Set up image paths
if (empty($CFG->custompix)) { // Could be set in the above file if (empty($CFG->custompix)) { // Could be set in the above file
$CFG->pixpath = $CFG->wwwroot .'/pix'; $CFG->pixpath = $CFG->wwwroot .'/pix';