Added graphics::mark_all_dirty(). The watermark code now marks images

as dirty if the admin changes the watermark at all.

2 files changed, 5 insertions, 2 deletions

diff --git a/modules/watermark/helpers/watermark.php b/modules/watermark/helpers/watermark.php
index af266bc5..40d779f7 100644
--- a/modules/watermark/helpers/watermark.php
+++ b/modules/watermark/helpers/watermark.php
@@ -26,7 +26,7 @@ class watermark_Core {
       ->options(array("northwest",  "north",  "northeast",
                       "west",       "center", "east",
                       "southwest",  "south",  "southeast"))
-      ->selected("8");
+      ->selected("southeast");
     $group->submit(_("Upload"));
     return $form;
   }
@@ -36,7 +36,7 @@ class watermark_Core {
     $group = $form->group("edit_watermark")->label(_("Edit Watermark"));
     $group->dropdown("position")->label(_("Watermark Position"))
       ->options(self::positions())
-      ->selected("8");
+      ->selected("southeast");
     $group->submit(_("Modify"));
     return $form;
   }
diff --git a/modules/watermark/helpers/watermark_installer.php b/modules/watermark/helpers/watermark_installer.php
index ef4f2c2f..52957273 100644
--- a/modules/watermark/helpers/watermark_installer.php
+++ b/modules/watermark/helpers/watermark_installer.php
@@ -40,6 +40,9 @@ class watermark_installer {
   }
 
   public static function uninstall() {
+    if (module::get_var("watermark", "name")) {
+      graphics::mark_all_dirty();
+    }
     module::delete("watermark");
     Database::instance()->query("DROP TABLE `watermarks`");
     dir::unlink(VARPATH . "modules/watermark");