diff options
| author | Chad Kieffer <ckieffer@gmail.com> | 2009-09-27 22:50:04 -0600 |
|---|---|---|
| committer | Chad Kieffer <ckieffer@gmail.com> | 2009-09-27 22:50:04 -0600 |
| commit | bb74d2f3609b9ffc0877eaec16ef19c04af97ce2 (patch) | |
| tree | 912ccf266758492b81d9838bf9b98631a203d1c3 /modules/watermark/controllers | |
| parent | 6cd8679dec24cd643fa3c2d9bdbf6ac8b938600c (diff) | |
| parent | ab5e680265dfe9c42bd4d6fb8d1d9fccd95eed7b (diff) | |
Merge branch 'master' of github.com:gallery/gallery3
Diffstat (limited to 'modules/watermark/controllers')
| -rw-r--r-- | modules/watermark/controllers/admin_watermarks.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/watermark/controllers/admin_watermarks.php b/modules/watermark/controllers/admin_watermarks.php index 423196ac..2a1d5f60 100644 --- a/modules/watermark/controllers/admin_watermarks.php +++ b/modules/watermark/controllers/admin_watermarks.php @@ -138,7 +138,7 @@ class Admin_Watermarks_Controller extends Admin_Controller { if ($name = module::get_var("watermark", "name")) { foreach (array("thumb", "resize") as $target) { graphics::add_rule( - "watermark", $target, "composite", + "watermark", $target, "gallery_graphics::composite", array("file" => VARPATH . "modules/watermark/$name", "width" => module::get_var("watermark", "width"), "height" => module::get_var("watermark", "height"), |