Merge commit 'upstream/master'

Conflicts:

	modules/gallery/tests/xss_data.txt

1 files changed, 0 insertions, 19 deletions

diff --git a/modules/user/views/user_languages_block.html.php b/modules/user/views/user_languages_block.html.php
deleted file mode 100644
index b5ae674c..00000000
--- a/modules/user/views/user_languages_block.html.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<?= form::dropdown("gSelectSessionLocale", $installed_locales, $selected) ?>
-<script type="text/javascript">
-  $("#gSelectSessionLocale").change(function() {
-    var old_locale_preference = <?= html::js_string($selected) ?>;
-    var locale = $(this).val();
-    if (old_locale_preference == locale) {
-      return;
-    }
-
-    var expires = -1;
-    if (locale) {
-      expires = 365;
-    }
-    $.cookie("g_locale", locale, {"expires": expires, "path": "/"});
-    window.location.reload(true);
-  });
-</script>
-