diff options
author | Thomas Citharel <tcit@tcit.fr> | 2014-08-21 16:24:13 +0200 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2014-08-21 16:24:13 +0200 |
commit | 45e60cb52a132917463bb45d1f1b41fc671ca659 (patch) | |
tree | ecc379d37a97de6b36c71bd5af2904befffea939 /inc/poche | |
parent | 1daa8e4a0f6e5afdd20ec307a28b02b1e30b0d70 (diff) | |
parent | 051f7fb28c312519419f41025c9a83b6befb91bc (diff) | |
download | wallabag-45e60cb52a132917463bb45d1f1b41fc671ca659.tar.gz wallabag-45e60cb52a132917463bb45d1f1b41fc671ca659.tar.zst wallabag-45e60cb52a132917463bb45d1f1b41fc671ca659.zip |
Merge branch 'dev' of https://github.com/wallabag/wallabag into dev
Diffstat (limited to 'inc/poche')
-rwxr-xr-x | inc/poche/Poche.class.php | 8 | ||||
-rwxr-xr-x | inc/poche/config.inc.default.php | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 64a5c4f7..c80e5d2a 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php | |||
@@ -524,6 +524,14 @@ class Poche | |||
524 | $longlastingsession = isset($_POST['longlastingsession']); | 524 | $longlastingsession = isset($_POST['longlastingsession']); |
525 | $passwordTest = ($isauthenticated) ? $user['password'] : Tools::encodeString($password . $login); | 525 | $passwordTest = ($isauthenticated) ? $user['password'] : Tools::encodeString($password . $login); |
526 | Session::login($user['username'], $user['password'], $login, $passwordTest, $longlastingsession, array('poche_user' => new User($user))); | 526 | Session::login($user['username'], $user['password'], $login, $passwordTest, $longlastingsession, array('poche_user' => new User($user))); |
527 | |||
528 | # reload l10n | ||
529 | $language = $user['config']['language']; | ||
530 | @putenv('LC_ALL=' . $language); | ||
531 | setlocale(LC_ALL, $language); | ||
532 | bindtextdomain($language, LOCALE); | ||
533 | textdomain($language); | ||
534 | |||
527 | $this->messages->add('s', _('welcome to your wallabag')); | 535 | $this->messages->add('s', _('welcome to your wallabag')); |
528 | Tools::logm('login successful'); | 536 | Tools::logm('login successful'); |
529 | Tools::redirect($referer); | 537 | Tools::redirect($referer); |
diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index 6f03af18..2a458544 100755 --- a/inc/poche/config.inc.default.php +++ b/inc/poche/config.inc.default.php | |||
@@ -59,7 +59,7 @@ | |||
59 | @define ('LOCALE', ROOT . '/locale'); | 59 | @define ('LOCALE', ROOT . '/locale'); |
60 | @define ('CACHE', ROOT . '/cache'); | 60 | @define ('CACHE', ROOT . '/cache'); |
61 | 61 | ||
62 | @define ('PAGINATION', '10'); | 62 | @define ('PAGINATION', '12'); |
63 | 63 | ||
64 | //limit for download of articles during import | 64 | //limit for download of articles during import |
65 | @define ('IMPORT_LIMIT', 5); | 65 | @define ('IMPORT_LIMIT', 5); |