? watermark_fix_action_check.patch
? watermark_fix_quotes.patch
Index: watermark.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/watermark/watermark.module,v
retrieving revision 1.10
diff -u -p -r1.10 watermark.module
--- watermark.module	23 Jun 2008 23:20:38 -0000	1.10
+++ watermark.module	12 Apr 2010 20:07:39 -0000
@@ -258,7 +258,11 @@ function watermark_form_alter(&$form, &$
     if (preg_match('/^\/node\/[0-9]+\/edit$/i', $form['#action'])) {
       $apply_watermark = FALSE;
     }
-    else if ($form['#action'] != '/node/add/image') {
+    else if (!preg_match("/\/node\/add\/image$/", $form['#action'])) {
+      // We test that the URL ends in '/node/add/image'. If Drupal is
+      // installed in a subdirectory, the path would be something like
+      // '/subdirectory/node/add/image' which is why we can't test for
+      // it to explicitly equal '/node/add/image'.
       return;
     }