adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use CakeSession wrapper

Browse source
This commit is contained in:
euromark 2012-11-27 00:09:21 +01:00
parent 5870d71e84
commit c3e501b2d9
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/Cake/I18n/I18n.php
View file

@ -23,6 +23,7 @@
App::uses('CakePlugin', 'Core');
App::uses('L10n', 'I18n');
App::uses('Multibyte', 'I18n');
App::uses('CakeSession', 'Model/Datasource');
/**
* I18n handles translation of Text and time format strings.
@ -142,9 +143,10 @@ class I18n {
}
if (empty($language)) {
if (!empty($_SESSION['Config']['language'])) {
$language = $_SESSION['Config']['language'];
} else {
if (CakeSession::started()) {
$language = CakeSession::read('Config.language');
}
if (empty($language)) {
$language = Configure::read('Config.language');
}
}