diff options
| author | Andy Staudacher <andy.st@gmail.com> | 2010-01-28 19:46:53 -0800 |
|---|---|---|
| committer | Andy Staudacher <andy.st@gmail.com> | 2010-01-28 19:46:53 -0800 |
| commit | 5c527513c688571adcff45f513efff54b9c55e61 (patch) | |
| tree | f1721d710d2dc06c97da86e5a7931470ca02862d | |
| parent | b8fb891828effa441a37efdd5babe03a5c7f5efe (diff) | |
Fix language preference block / language cookie reading.
The preference block must have been broken by a jquery update, and the cookie reading by a Kohana update.
| -rw-r--r-- | modules/gallery/helpers/locales.php | 4 | ||||
| -rw-r--r-- | modules/gallery/views/user_languages_block.html.php | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/modules/gallery/helpers/locales.php b/modules/gallery/helpers/locales.php index 5c8c227a..dc32b12f 100644 --- a/modules/gallery/helpers/locales.php +++ b/modules/gallery/helpers/locales.php @@ -238,7 +238,9 @@ class locales_Core { } static function cookie_locale() { - $cookie_data = Input::instance()->cookie("g_locale"); + // Can't use Input framework for client side cookies since + // they're not signed. + $cookie_data = isset($_COOKIE["g_locale"]) ? $_COOKIE["g_locale"] : null; $locale = null; if ($cookie_data) { if (preg_match("/^([a-z]{2,3}(?:_[A-Z]{2})?)$/", trim($cookie_data), $matches)) { diff --git a/modules/gallery/views/user_languages_block.html.php b/modules/gallery/views/user_languages_block.html.php index 89185967..3776ca13 100644 --- a/modules/gallery/views/user_languages_block.html.php +++ b/modules/gallery/views/user_languages_block.html.php @@ -1,7 +1,7 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> <?= form::dropdown("g-select-session-locale", $installed_locales, $selected) ?> <script type="text/javascript"> - $("#g-select-session-locale").change(function() { + $("select[name=g-select-session-locale]").change(function() { var old_locale_preference = <?= html::js_string($selected) ?>; var locale = $(this).val(); if (old_locale_preference == locale) { |