Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev

1 files changed, 8 insertions, 9 deletions

diff --git a/modules/gallery/controllers/l10n_client.php b/modules/gallery/controllers/l10n_client.php
index 71df1cf1..e20bab50 100644
--- a/modules/gallery/controllers/l10n_client.php
+++ b/modules/gallery/controllers/l10n_client.php
@@ -29,9 +29,9 @@ class L10n_Client_Controller extends Controller {
     $key = $input->post("l10n-message-key");
 
     $root_message = ORM::factory("incoming_translation")
-        ->where(array("key" => $key,
-                      "locale" => "root"))
-        ->find();
+      ->where("key", "=", $key)
+      ->where("locale", "=", "root")
+      ->find();
 
     if (!$root_message->loaded()) {
       throw new Exception("@todo bad request data / illegal state");
@@ -56,8 +56,8 @@ class L10n_Client_Controller extends Controller {
     }
 
     $entry = ORM::factory("outgoing_translation")
-      ->where(array("key" => $key,
-                    "locale" => $locale))
+      ->where("key", "=", $key)
+      ->where("locale", "=", $locale)
       ->find();
 
     if (!$entry->loaded()) {
@@ -70,8 +70,8 @@ class L10n_Client_Controller extends Controller {
     $entry->translation = serialize($translation);
 
     $entry_from_incoming = ORM::factory("incoming_translation")
-      ->where(array("key" => $key,
-                    "locale" => $locale))
+      ->where("key", "=", $key)
+      ->where("locale", "=", $locale)
       ->find();
 
     if (!$entry_from_incoming->loaded()) {
@@ -102,10 +102,9 @@ class L10n_Client_Controller extends Controller {
   }
 
   private static function _l10n_client_search_form() {
-    $form = new Forge("l10n_client/search", "", "post", array("id" => "g-l10n-search-form"));
+    $form = new Forge("#", "", "post", array("id" => "g-l10n-search-form"));
     $group = $form->group("l10n_search");
     $group->input("l10n-search")->id("g-l10n-search");
-    $group->submit("l10n-search-filter-clear")->value(t("X"));
 
     return $form;
   }