Merge commit 'upstream/master'

Conflicts:

	modules/gallery/tests/xss_data.txt

1 files changed, 3 insertions, 26 deletions

diff --git a/modules/user/helpers/user_event.php b/modules/user/helpers/user_event.php
index ede4e515..cf91812e 100644
--- a/modules/user/helpers/user_event.php
+++ b/modules/user/helpers/user_event.php
@@ -17,37 +17,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class user_event_Core {
-  /**
-   * Initialization.
-   */
-  static function gallery_ready() {
-    user::load_user();
-    self::set_request_locale();
-  }
 
+class user_event_Core {
   static function admin_menu($menu, $theme) {
-    $menu->add_after("appearance_menu",
-                     Menu::factory("link")
+    $menu->add_after("appearance_menu", Menu::factory("link")
                      ->id("users_groups")
                      ->label(t("Users/Groups"))
                      ->url(url::site("admin/users")));
-  }
 
-  static function set_request_locale() {
-    // 1. Check the session specific preference (cookie)
-    $locale = user::cookie_locale();
-    // 2. Check the user's preference
-    if (!$locale) {
-      $locale = user::active()->locale;
-    }
-    // 3. Check the browser's / OS' preference
-    if (!$locale) {
-      $locale = locales::locale_from_http_request();
-    }
-    // If we have any preference, override the site's default locale
-    if ($locale) {
-      I18n::instance()->locale($locale);
-    }
+    return $menu;
   }
 }