Minor changes to more closely align this branch with master

3 files changed, 28 insertions, 31 deletions

diff --git a/modules/gallery/helpers/locales.php b/modules/gallery/helpers/locales.php
index c2a606cd..2de029ff 100644
--- a/modules/gallery/helpers/locales.php
+++ b/modules/gallery/helpers/locales.php
@@ -136,23 +136,6 @@ class locales_Core {
     return in_array($language, array("he", "fa", "ar"));
   }
 
-  static function set_request_locale() {
-    // 1. Check the session specific preference (cookie)
-    $locale = self::cookie_locale();
-    // 2. Check the user's preference
-    if (!$locale) {
-      $locale = identity::active_user()->locale;
-    }
-    // 3. Check the browser's / OS' preference
-    if (!$locale) {
-      $locale = self::locale_from_http_request();
-    }
-    // If we have any preference, override the site's default locale
-    if ($locale) {
-      I18n::instance()->locale($locale);
-    }
-  }
-
   /**
    * Returns the best match comparing the HTTP accept-language header
    * with the installed locales.
@@ -237,6 +220,23 @@ class locales_Core {
     return array(null, 0);
   }
 
+  static function set_request_locale() {
+    // 1. Check the session specific preference (cookie)
+    $locale = self::cookie_locale();
+    // 2. Check the user's preference
+    if (!$locale) {
+      $locale = identity::active_user()->locale;
+    }
+    // 3. Check the browser's / OS' preference
+    if (!$locale) {
+      $locale = self::locale_from_http_request();
+    }
+    // If we have any preference, override the site's default locale
+    if ($locale) {
+      I18n::instance()->locale($locale);
+    }
+  }
+
   static function cookie_locale() {
     $cookie_data = Input::instance()->cookie("g_locale");
     $locale = null;
diff --git a/modules/user/helpers/user_event.php b/modules/user/helpers/user_event.php
index 7916047f..a4a6e5da 100644
--- a/modules/user/helpers/user_event.php
+++ b/modules/user/helpers/user_event.php
@@ -20,19 +20,17 @@
 
 class user_event_Core {
   static function admin_menu($menu, $theme) {
-    $config = module::get_var("gallery", "identity_provider", "user");
-    if ($config == "user") {
-      $user_group_menu = Menu::factory("link")
-        ->id("users_groups")
-        ->label(t("Users/Groups"))
-        ->url(url::site("admin/users"));
-      $identity_menu = $menu->get("identity_menu");
-      if (empty($identity_menu)) {
-        $menu->add_after("appearance_menu", $user_group_menu);
-      }else {
-        $identity_menu->append($user_group_menu);
-      }
+    $user_group_menu = Menu::factory("link")
+      ->id("users_groups")
+      ->label(t("Users/Groups"))
+      ->url(url::site("admin/users"));
+    $identity_menu = $menu->get("identity_menu");
+    if (empty($identity_menu)) {
+      $menu->add_after("appearance_menu", $user_group_menu);
+    }else {
+      $identity_menu->append($user_group_menu);
     }
+
     return $menu;
   }
 }
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 65a2f43b..a889545b 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -418,8 +418,7 @@ li.g-group .g-user .g-button {
   vertical-align: middle;
 }
 
-li.g-default-group h4, li.g-default-group .g-user,
-li.g-group-disable h4, li.g-group-disable .g-user {
+li.g-default-group h4, li.g-default-group .g-user {
   color: gray;
 }