Change gallery installer to do a direct update to the database, preppending gallery_graphics:: to each of the defined rules operations

2 files changed, 3 insertions, 31 deletions

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index f995b606..49bd9bb7 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -377,16 +377,8 @@ class gallery_installer {
 
     if ($version == 13) {
       // Add rules for generating our thumbnails and resizes
-      graphics::remove_rule("gallery", "thumb", "gallery_graphics::resize");
-      graphics::remove_rule("gallery", "resize", "gallery_graphics::resize");
-      graphics::add_rule(
-        "gallery", "thumb", "gallery_graphics::resize",
-        array("width" => 200, "height" => 200, "master" => Image::AUTO),
-        100);
-      graphics::add_rule(
-        "gallery", "resize", "gallery_graphics::resize",
-        array("width" => 640, "height" => 480, "master" => Image::AUTO),
-        100);
+      Database::instance()->query("update g3_graphics_rules g
+                                   set operation=concat(\"gallery_graphics::\", g.operation);");
       module::set_version("gallery", $version = 14);
     }
 
diff --git a/modules/watermark/helpers/watermark_installer.php b/modules/watermark/helpers/watermark_installer.php
index 5c7dfdab..b3e91044 100644
--- a/modules/watermark/helpers/watermark_installer.php
+++ b/modules/watermark/helpers/watermark_installer.php
@@ -33,31 +33,11 @@ class watermark_installer {
                DEFAULT CHARSET=utf8;");
 
     @mkdir(VARPATH . "modules/watermark");
-    module::set_version("watermark", 2);
+    module::set_version("watermark", 1);
   }
 
   static function uninstall() {
     Database::instance()->query("DROP TABLE {watermarks}");
     dir::unlink(VARPATH . "modules/watermark");
   }
-
-  static function upgrade($version) {
-    $db = Database::instance();
-    if ($version == 1) {
-      graphics::remove_rules("watermark");
-      if ($name = module::get_var("watermark", "name")) {
-        foreach (array("thumb", "resize") as $target) {
-          graphics::add_rule(
-            "watermark", $target, "gallery_graphics::composite",
-            array("file" => VARPATH . "modules/watermark/$name",
-                  "width" => module::get_var("watermark", "width"),
-                  "height" => module::get_var("watermark", "height"),
-                  "position" => module::get_var("watermark", "position"),
-                  "transparency" => 101 - module::get_var("watermark", "transparency")),
-            1000);
-        }
-      }
-      module::set_version("watermark", $version = 2);
-    }
-  }
 }