Merge commit 'upstream/master'

Conflicts:

	modules/gallery/tests/xss_data.txt

1 files changed, 4 insertions, 4 deletions

diff --git a/modules/gallery/controllers/l10n_client.php b/modules/gallery/controllers/l10n_client.php
index 6e19310b..6db67d3b 100644
--- a/modules/gallery/controllers/l10n_client.php
+++ b/modules/gallery/controllers/l10n_client.php
@@ -20,7 +20,7 @@
 class L10n_Client_Controller extends Controller {
   public function save() {
     access::verify_csrf();
-    if (!user::active()->admin) {
+    if (!identity::active_user()->admin) {
       access::forbidden();
     }
 
@@ -85,7 +85,7 @@ class L10n_Client_Controller extends Controller {
 
   public function toggle_l10n_mode() {
     access::verify_csrf();
-    if (!user::active()->admin) {
+    if (!identity::active_user()->admin) {
       access::forbidden();
     }
 
@@ -102,9 +102,9 @@ class L10n_Client_Controller extends Controller {
   }
 
   private static function _l10n_client_search_form() {
-    $form = new Forge("l10n_client/search", "", "post", array("id" => "gL10nSearchForm"));
+    $form = new Forge("l10n_client/search", "", "post", array("id" => "g-l10n-search-form"));
     $group = $form->group("l10n_search");
-    $group->input("l10n-search")->id("gL10nSearch");
+    $group->input("l10n-search")->id("g-l10n-search");
     $group->submit("l10n-search-filter-clear")->value(t("X"));
 
     return $form;