mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-11 20:21:16 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
ca706753bc
|
@ -89,7 +89,7 @@ class SeedDMS_Theme_Style extends SeedDMS_View_Common {
|
|||
if($this->params['session'] && ($slang = $this->params['session']->getLanguage())) {
|
||||
echo str_replace('_', '-', $slang);
|
||||
} else {
|
||||
echo str_replace('_', '-', $settings->_language);
|
||||
echo str_replace('_', '-', $this->params['settings']->_language);
|
||||
}
|
||||
echo "\">\n<head>\n";
|
||||
echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
|
||||
|
|
|
@ -91,7 +91,7 @@ class SeedDMS_Theme_Style extends SeedDMS_View_Common {
|
|||
if($this->params['session'] && ($slang = $this->params['session']->getLanguage())) {
|
||||
echo str_replace('_', '-', $slang);
|
||||
} else {
|
||||
echo str_replace('_', '-', $settings->_language);
|
||||
echo str_replace('_', '-', $this->params['settings']->_language);
|
||||
}
|
||||
echo "\">\n<head>\n";
|
||||
echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
|
||||
|
|
Loading…
Reference in New Issue
Block a user