From df3a1e730e285cf8a9c189cb602f7d5dee651101 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Tue, 12 May 2009 05:56:27 +0000 Subject: Skip the copy if the watermark module is enabled *and* there's a watermark. --- modules/g2_import/helpers/g2_import.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/g2_import/helpers/g2_import.php') diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php index 482f4089..ef8065ad 100644 --- a/modules/g2_import/helpers/g2_import.php +++ b/modules/g2_import/helpers/g2_import.php @@ -384,7 +384,7 @@ class g2_import_Core { // Precaution: if the Gallery2 item was watermarked, or we have the Gallery3 watermark module // active then we'd have to do something a lot more sophisticated here. For now, just skip // this step in those cases. - if (module::is_installed("watermark")) { + if (module::is_installed("watermark") && module::get_var("watermark", "name")) { return; } -- cgit v1.2.3