Fix for ticket #972 and more. In Kohana 2.4, ORM::delete_all ignores any where

clauses and deletes all the entries in the table unless an array of id's are
passed as the parameter.  This fix used the Database_builder to specify any where
conditions. Thanks psvo for find the first one. :-)

2 files changed, 6 insertions, 4 deletions

diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index 7577d7ac..5a290905 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -60,11 +60,12 @@ class graphics_Core {
    * @param string  $operation   the name of the operation(<defining class>::method)
    */
   static function remove_rule($module_name, $target, $operation) {
-    ORM::factory("graphics_rule")
+    db::build()
+      ->delete("graphics_rules")
       ->where("module_name", "=", $module_name)
       ->where("target", "=", $target)
       ->where("operation", "=", $operation)
-      ->delete_all();
+      ->execute();
 
     self::mark_dirty($target == "thumb", $target == "resize");
   }
diff --git a/modules/gallery/tests/Gallery_I18n_Test.php b/modules/gallery/tests/Gallery_I18n_Test.php
index 895e3051..5d2fd994 100644
--- a/modules/gallery/tests/Gallery_I18n_Test.php
+++ b/modules/gallery/tests/Gallery_I18n_Test.php
@@ -28,9 +28,10 @@ class Gallery_I18n_Test extends Unit_Test_Case {
         'locale_dir' => VARPATH . 'locale/');
     $this->i18n = Gallery_I18n::instance($config);
 
-    ORM::factory("incoming_translation")
+    db::build()
+      ->delete("incoming_translations")
       ->where("locale", "=", "te_ST")
-      ->delete_all();
+      ->execute();
 
     $messages_te_ST = array(
         array('Hello world', 'Hallo Welt'),