From 3ab6c4915aa0c9dbd2061ffcad0af00e2c50136e Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 11 Jan 2010 10:42:39 -0800
Subject: Fixes ticket #671. In the graphics_rules table height and width set
 the maximum height and width values and should be equal.  Initially, the
 height on the resize target rule was less than the height, which artificially
 constrained images in portrait mode.

**Note"" this fix requires an upgrade to version 22.  All the resizes will be flagged
dirty.
---
 modules/gallery/helpers/gallery_installer.php | 19 ++++++++++++++++++-
 modules/gallery/module.info                   |  2 +-
 2 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 410b6413..02ce1b18 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -240,7 +240,7 @@ class gallery_installer {
       100);
     graphics::add_rule(
       "gallery", "resize", "gallery_graphics::resize",
-      array("width" => 640, "height" => 480, "master" => Image::AUTO),
+      array("width" => 640, "height" => 640, "master" => Image::AUTO),
       100);
 
     // Instantiate default themes (site and admin)
@@ -440,6 +440,23 @@ class gallery_installer {
       module::set_var("gallery", "simultaneous_upload_limit", 5);
       module::set_version("gallery", $version = 21);
     }
+
+    // Update the graphics rules table so that the maximum height for resizes is 640 not 480.
+    // Fixes ticket #671
+    if ( $version == 21) {
+      $resize_rule = ORM::factory("graphics_rule")
+        ->where("id", "=", "2")
+        ->find();
+      // make sure it hasn't been changed already
+      $args = unserialize($resize_rule->args);
+      if ($args["height"] == 480 && $args["width"] == 640) {
+        $args["height"] = 640;
+        $resize_rule->args = serialize($args);
+        $resize_rule->save();
+        graphics::mark_dirty(false, true);
+      }
+      module::set_version("gallery", $version = 22);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index b3366f7d..107d9a12 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,4 +1,4 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 21
+version = 22
 
-- 
cgit v1.2.3


From 284e14d50e33fb6a1ef0ce00444f216fcdbeb904 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 11 Jan 2010 10:48:27 -0800
Subject: Remove the automatically marking the resizes dirty line as this could
 cause alot of pain to some installations

---
 modules/gallery/helpers/gallery_installer.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 02ce1b18..1e0ad28c 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -453,7 +453,6 @@ class gallery_installer {
         $args["height"] = 640;
         $resize_rule->args = serialize($args);
         $resize_rule->save();
-        graphics::mark_dirty(false, true);
       }
       module::set_version("gallery", $version = 22);
     }
-- 
cgit v1.2.3


From 2b283f4d011a7a67f306e11e590b499242a0774b Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 11 Jan 2010 13:26:10 -0800
Subject: Remove the translation submit button from translation search form. 
 Fixes ticket #975

---
 modules/gallery/controllers/l10n_client.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/l10n_client.php b/modules/gallery/controllers/l10n_client.php
index 71df1cf1..d22b6299 100644
--- a/modules/gallery/controllers/l10n_client.php
+++ b/modules/gallery/controllers/l10n_client.php
@@ -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;
   }
-- 
cgit v1.2.3


From 3b26d87f3a8fdcf4dc0b86e2b2d72476356c411a Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 11 Jan 2010 14:22:16 -0800
Subject: Reformat the string list so that the search box does not get push off
 the end of the page.

---
 modules/gallery/css/l10n_client.css | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/css/l10n_client.css b/modules/gallery/css/l10n_client.css
index 542da8e6..3771c049 100644
--- a/modules/gallery/css/l10n_client.css
+++ b/modules/gallery/css/l10n_client.css
@@ -86,7 +86,7 @@
 }
 
 #l10n-client .string-list {
-  height:17em;
+  height: 16em;
   overflow:auto;
   list-style:none; list-style-image:none;
   margin:0em; padding:0em;}
@@ -129,10 +129,9 @@
   font-weight:bold;}
 
 #l10n-client #g-l10n-search-form {
-  background:#eee;
-  text-align:center;
-  height:2em; line-height:2em;
-  margin:0em; padding:.5em .5em;
+  background: #eee;
+  margin: 0em;
+  padding: .25em .25em;
 }
 
 #l10n-client #g-l10n-search-form .form-item,
@@ -148,8 +147,14 @@
   padding:0em;
 }
 
-#l10n-client #g-l10n-search-form input.form-text {
-  width:80%;
+#l10n-client #g-l10n-search-form fieldset {
+  margin-bottom: 0;
+  padding: .25em .25em;
+}
+
+
+#l10n-client #g-l10n-search-form input {
+  width: 96.75%;
 }
 
 #l10n-client #g-l10n-search-form #search-filter-clear {
@@ -164,7 +169,9 @@
 
 #l10n-client-string-editor .source {
   overflow:hidden;
-  width:50%; float:left;}
+  width:50%;
+  float:left;
+}
 
 #l10n-client-string-editor .source .source-text {
   line-height:1.5em;
@@ -178,10 +185,13 @@
 
 #l10n-client-string-editor .translation {
   overflow:hidden;
-  width:49%; float:right;}
+  width:49%;
+  float: right;
+}
 
 #g-l10n-client-save-form {
-  padding:0em;}
+  padding: 0em;
+}
 
 #l10n-client form ul,
 #l10n-client form li,
-- 
cgit v1.2.3


From 3dfac5884ff0661d680293f9888f9ab42e9ebd19 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 12 Jan 2010 08:31:28 -0800
Subject: Add a css id attribute to the i10n-edit-translation element.  Fixes
 ticket #969.

---
 modules/gallery/views/l10n_client.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/gallery/views/l10n_client.html.php b/modules/gallery/views/l10n_client.html.php
index 9d14bbb2..47a45e29 100644
--- a/modules/gallery/views/l10n_client.html.php
+++ b/modules/gallery/views/l10n_client.html.php
@@ -40,7 +40,7 @@
       <form method="post" action="<?= url::site("l10n_client/save") ?>" id="g-l10n-client-save-form">
         <?= access::csrf_form_field() ?>
         <?= form::hidden("l10n-message-key") ?>
-        <?= form::textarea("l10n-edit-translation", "", ' rows="5" class="translationField"') ?>
+        <?= form::textarea("l10n-edit-translation", "", ' id="l10n-edit-translation" rows="5" class="translationField"') ?>
         <div id="plural-zero" class="translationField hidden">
           <label for="l10n-edit-plural-translation-zero">[zero]</label>
           <?= form::textarea("l10n-edit-plural-translation-zero", "", ' rows="2"') ?>
-- 
cgit v1.2.3


From 9ff9d70fe23efdc76bb0a3aaaaa3c8e06166797e Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 12 Jan 2010 08:32:33 -0800
Subject: Some whitespace and syntax corrects

---
 modules/gallery/js/l10n_client.js | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/js/l10n_client.js b/modules/gallery/js/l10n_client.js
index 9acb6ca8..58032a48 100644
--- a/modules/gallery/js/l10n_client.js
+++ b/modules/gallery/js/l10n_client.js
@@ -17,7 +17,6 @@ $(document).ready(function() {
   Gallery.attachBehaviors(this);
 });
 
-
 // Store all l10n_client related data + methods in its own object
 jQuery.extend(Gallery, {
   l10nClient: new (function() {
@@ -51,7 +50,8 @@ jQuery.extend(Gallery, {
           this.filter(false);
         break;
       }
-    }
+    };
+
     // Toggle the l10nclient
     this.toggle = function(state) {
       switch(state) {
@@ -82,15 +82,18 @@ jQuery.extend(Gallery, {
           $.cookie('Gallery_l10n_client', '0', {expires: 7, path: '/'});
         break;
       }
-    }
+    };
+
     // Get a string from the DOM tree
     this.getString = function(index, type) {
       return l10n_client_data[index][type];
-    }
+    };
+
     // Set a string in the DOM tree
     this.setString = function(index, data) {
       l10n_client_data[index]['translation'] = data;
-    }
+    };
+
     // Display the source message
     this.showSourceMessage = function(source, is_plural) {
       if (is_plural) {
@@ -101,10 +104,11 @@ jQuery.extend(Gallery, {
         var pretty_source = $('#source-text-tmp-space').text(source).html();
       }
       $('#l10n-client-string-editor .source-text').html(pretty_source);
-    }
+    };
     this.isPluralMessage = function(message) {
       return typeof(message) == 'object';
-    }
+    };
+
     this.updateTranslationForm = function(translation, is_plural) {
       $('.translationField').addClass('hidden');
       if (is_plural) {
@@ -122,10 +126,11 @@ jQuery.extend(Gallery, {
           $('#plural-' + form).removeClass('hidden');
         }
       } else {
-          $('#l10n-edit-translation').attr('value', translation);
+        $('#l10n-edit-translation').attr('value', translation);
         $('#l10n-edit-translation').removeClass('hidden');
       }
-    }
+    };
+
     // Filter the string list by a search string
     this.filter = function(search) {
       if(search == false || search == '') {
@@ -140,7 +145,7 @@ jQuery.extend(Gallery, {
           $('#l10n-client #g-l10n-search').val(search);
         }
       }
-    }
+    };
 
     this.copySourceText = function() {
       var index  = Gallery.l10nClient.selected;
@@ -166,7 +171,7 @@ jQuery.extend(Gallery, {
         }
 
       }
-    }
+    };
   })
 });
 
@@ -205,8 +210,8 @@ Gallery.behaviors.l10nClient = function(context) {
       Gallery.l10nClient.toggle(0);
     }
   });
-	
-	// Close the l10n client using an AJAX call and refreshing the page
+
+  // Close the l10n client using an AJAX call and refreshing the page
   $('#g-close-l10n').click(function(event) {
 		$.ajax({
       type: "GET",
@@ -222,8 +227,8 @@ Gallery.behaviors.l10nClient = function(context) {
   // Register keybindings using jQuery hotkeys
   // TODO: Either remove hotkeys code or add query.hotkeys.js.
   if($.hotkeys) {
-    $.hotkeys.add(Gallery.l10nClient.keys['toggle'], function(){Gallery.l10nClient.key('toggle')});
-    $.hotkeys.add(Gallery.l10nClient.keys['clear'], {target:'#l10n-client #g-l10n-search', type:'keyup'}, function(){Gallery.l10nClient.key('clear')});
+    $.hotkeys.add(Gallery.l10nClient.keys['toggle'], function(){Gallery.l10nClient.key('toggle');});
+    $.hotkeys.add(Gallery.l10nClient.keys['clear'], {target:'#l10n-client #g-l10n-search', type:'keyup'}, function(){Gallery.l10nClient.key('clear');});
   }
 
   // Custom listener for l10n_client livesearch
@@ -246,9 +251,9 @@ Gallery.behaviors.l10nClient = function(context) {
               var num_plural_forms = plural_forms.length;
 
               // Store translation in local js
+              var translation = {};
               if (is_plural) {
-                  var translation = {};
-                  for (var i = 0; i < num_plural_forms; i++) {
+                   for (var i = 0; i < num_plural_forms; i++) {
                       var form = plural_forms[i];
                       translation[form] = $('#g-l10n-client-save-form #l10n-edit-plural-translation-' + form).attr('value');
                   }
-- 
cgit v1.2.3


From 42d7c9590ee480e106ac343e6b3224d2b0fdaab0 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 12 Jan 2010 08:58:49 -0800
Subject: Correct the "l10n_client_data[index] is undefined" error.

---
 modules/gallery/js/l10n_client.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/gallery/js/l10n_client.js b/modules/gallery/js/l10n_client.js
index 58032a48..f0aff0b6 100644
--- a/modules/gallery/js/l10n_client.js
+++ b/modules/gallery/js/l10n_client.js
@@ -86,7 +86,10 @@ jQuery.extend(Gallery, {
 
     // Get a string from the DOM tree
     this.getString = function(index, type) {
-      return l10n_client_data[index][type];
+      if (index < l10n_client_data.length) {
+        return l10n_client_data[index][type];
+      }
+      return "";
     };
 
     // Set a string in the DOM tree
-- 
cgit v1.2.3


From e81acce985b35602bf66ddbf9fe7fa5a065116c9 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 12 Jan 2010 09:42:06 -0800
Subject: If the user hits enter in the search text field, then cancel the
 submission, because the search is done in the browser and the the enter will
 unexpectedly reload the root directory.

---
 modules/gallery/js/l10n_client.js | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'modules')

diff --git a/modules/gallery/js/l10n_client.js b/modules/gallery/js/l10n_client.js
index f0aff0b6..d0d6f619 100644
--- a/modules/gallery/js/l10n_client.js
+++ b/modules/gallery/js/l10n_client.js
@@ -234,6 +234,11 @@ Gallery.behaviors.l10nClient = function(context) {
     $.hotkeys.add(Gallery.l10nClient.keys['clear'], {target:'#l10n-client #g-l10n-search', type:'keyup'}, function(){Gallery.l10nClient.key('clear');});
   }
 
+  // never actually submit the form as the search is done in the browser
+  $('#g-l10n-search-form').submit(function() {
+    return false;
+  });
+
   // Custom listener for l10n_client livesearch
   $('#l10n-client #g-l10n-search').keyup(function(key) {
     Gallery.l10nClient.filter($('#l10n-client #g-l10n-search').val());
-- 
cgit v1.2.3


From 639f1e741a5c9c96db1ab894cea7aa90cad82dbc Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 12 Jan 2010 11:42:31 -0800
Subject: Put quotes around the item titles in all the messages and more
 importantly actually display the original's title properly.  Fixes ticket
 #966, but does now show us ticket #978

---
 modules/notification/helpers/notification.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'modules')

diff --git a/modules/notification/helpers/notification.php b/modules/notification/helpers/notification.php
index e9fc3f33..a2271b59 100644
--- a/modules/notification/helpers/notification.php
+++ b/modules/notification/helpers/notification.php
@@ -101,10 +101,10 @@ class notification {
     $v = new View("item_updated.html");
     $v->item = $item;
     $v->subject = $item->is_album() ?
-      t("Album %title updated", array("title" => $item->original("title"))) :
+      t("Album \"%title\" updated", array("title" => $item->original()->title)) :
       ($item->is_photo() ?
-       t("Photo %title updated", array("title" => $item->original("title")))
-       : t("Movie %title updated", array("title" => $item->original("title"))));
+       t("Photo \"%title\" updated", array("title" => $item->original()->title))
+       : t("Movie \"%title\" updated", array("title" => $item->original()->title)));
 
     self::_notify($subscribers, $item, $v->render(), $v->subject);
   }
@@ -119,12 +119,12 @@ class notification {
     $v = new View("item_added.html");
     $v->item = $item;
     $v->subject = $item->is_album() ?
-      t("Album %title added to %parent_title",
+      t("Album \"%title\" added to \"%parent_title\"",
         array("title" => $item->title, "parent_title" => $parent->title)) :
       ($item->is_photo() ?
-       t("Photo %title added to %parent_title",
+       t("Photo \"%title\" added to \"%parent_title\"",
          array("title" => $item->title, "parent_title" => $parent->title)) :
-       t("Movie %title added to %parent_title",
+       t("Movie \"%title\" added to \"%parent_title\"",
            array("title" => $item->title, "parent_title" => $parent->title)));
 
     self::_notify($subscribers, $item, $v->render(), $v->subject);
@@ -140,12 +140,12 @@ class notification {
     $v = new View("item_deleted.html");
     $v->item = $item;
     $v->subject = $item->is_album() ?
-      t("Album %title removed from %parent_title",
+      t("Album \"%title\" removed from \"%parent_title\"",
         array("title" => $item->title, "parent_title" => $parent->title)) :
       ($item->is_photo() ?
-       t("Photo %title removed from %parent_title",
+       t("Photo \"%title\" removed from \"%parent_title\"",
          array("title" => $item->title, "parent_title" => $parent->title))
-       : t("Movie %title removed from %parent_title",
+       : t("Movie \"%title\" removed from \"%parent_title\"",
            array("title" => $item->title, "parent_title" => $parent->title)));
 
     self::_notify($subscribers, $item, $v->render(), $v->subject);
@@ -161,10 +161,10 @@ class notification {
     $v = new View("comment_published.html");
     $v->comment = $comment;
     $v->subject = $item->is_album() ?
-      t("A new comment was published for album %title", array("title" => $item->title)) :
+      t("A new comment was published for album \"%title\"", array("title" => $item->title)) :
       ($item->is_photo() ?
-       t("A new comment was published for photo %title", array("title" => $item->title))
-       : t("A new comment was published for movie %title", array("title" => $item->title)));
+       t("A new comment was published for photo \"%title\"", array("title" => $item->title))
+       : t("A new comment was published for movie \"%title\"", array("title" => $item->title)));
 
     self::_notify($subscribers, $item, $v->render(), $v->subject);
   }
-- 
cgit v1.2.3


From daeaca110d16128040c86727c65df225e957f7c6 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 13 Jan 2010 11:27:09 -0800
Subject: Fix for ticket #978.  Don't reset the original property as part of
 the save processing, because that will overwrite the original values with all
 the new values.  The problem with the original approach is that when changed
 event handlers used ->original(), it had already been reset as part of the
 save processing. Went back and forth on either leaving this alone and forcing
 callers to save the original prior to calling the save function, but there
 were a few event handlers that used ->original().  This seemed the easier
 change. So to reset the original you need to call reload() or clear(). There
 is now an optional parameter on the reload to only reload the original.

---
 modules/gallery/libraries/MY_ORM.php      | 20 ++++++++++++++++++--
 modules/gallery/tests/Item_Model_Test.php |  1 +
 2 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/libraries/MY_ORM.php b/modules/gallery/libraries/MY_ORM.php
index 56c776aa..95fa9006 100644
--- a/modules/gallery/libraries/MY_ORM.php
+++ b/modules/gallery/libraries/MY_ORM.php
@@ -19,12 +19,11 @@
  */
 class ORM extends ORM_Core {
   // Track the original value of this ORM so that we can look it up in ORM::original()
-  protected $original = null;
+  protected $original;
 
   public function save() {
     model_cache::clear();
     $result = parent::save();
-    $this->original = clone $this;
     return $result;
   }
 
@@ -48,7 +47,24 @@ class ORM extends ORM_Core {
     return parent::__unset($column);
   }
 
+  public function reload($original_only=false) {
+    if (!$original_only) {
+      parent::reload();
+    }
+    $this->original = clone $this;
+    return $this;
+  }
+
+  public function clear() {
+    parent::clear();
+    $this->original = clone $this;
+    return $this;
+  }
+
   public function original() {
+    if (!isset($this->original)) {
+      $this->original = clone $this;
+    }
     return $this->original;
   }
 }
diff --git a/modules/gallery/tests/Item_Model_Test.php b/modules/gallery/tests/Item_Model_Test.php
index bf5fca1a..c0ac4436 100644
--- a/modules/gallery/tests/Item_Model_Test.php
+++ b/modules/gallery/tests/Item_Model_Test.php
@@ -166,6 +166,7 @@ class Item_Model_Test extends Unit_Test_Case {
     $item = self::_create_random_item();
     $item->title = "ORIGINAL_VALUE";
     $item->save();
+    $item->reload(false);
     $item->title = "NEW_VALUE";
 
     $this->assert_same("ORIGINAL_VALUE", $item->original()->title);
-- 
cgit v1.2.3


From e41ad23a8ea05d28a99d12c01d8f317455b1d361 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 13 Jan 2010 11:47:27 -0800
Subject: Did the old commit then save trick

---
 modules/gallery/libraries/MY_ORM.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/libraries/MY_ORM.php b/modules/gallery/libraries/MY_ORM.php
index 95fa9006..1bf5dd13 100644
--- a/modules/gallery/libraries/MY_ORM.php
+++ b/modules/gallery/libraries/MY_ORM.php
@@ -47,8 +47,8 @@ class ORM extends ORM_Core {
     return parent::__unset($column);
   }
 
-  public function reload($original_only=false) {
-    if (!$original_only) {
+  public function reload($reload_all=true) {
+    if ($reload_all) {
       parent::reload();
     }
     $this->original = clone $this;
-- 
cgit v1.2.3


From 260660b2f61e96372686eacce2ce7b66a40be4a2 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 13 Jan 2010 12:08:56 -0800
Subject: Somemore K24 migration holdovers.  need to specify the where
 statement with operands. '=' is no longer assumed. Fixes ticket #979

---
 modules/gallery/controllers/l10n_client.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/l10n_client.php b/modules/gallery/controllers/l10n_client.php
index d22b6299..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()) {
-- 
cgit v1.2.3