diff options
| author | Chad Kieffer <ckieffer@227.1.241.10.in-addr.arpa> | 2010-06-14 14:43:14 -0400 |
|---|---|---|
| committer | Chad Kieffer <ckieffer@227.1.241.10.in-addr.arpa> | 2010-06-14 14:43:14 -0400 |
| commit | 3c6e710aa75b309fd7ff50aa8f5c58721b17770f (patch) | |
| tree | 062b516f3fad5921e4ace326fa6b2f7f868ca87e /modules/watermark/controllers | |
| parent | 782c1e0ae0bc597629abcd88f844d863da45901a (diff) | |
| parent | 793780daa7665f7f86994235c4263fcb63554eb8 (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 d26919d5..18b463ca 100644 --- a/modules/watermark/controllers/admin_watermarks.php +++ b/modules/watermark/controllers/admin_watermarks.php @@ -124,7 +124,7 @@ class Admin_Watermarks_Controller extends Admin_Controller { array("result" => "success", "location" => url::site("admin/watermarks"))); } else { - print json_encode(array("result" => "error", "form" => (string) $form)); + print json_encode(array("result" => "error", "form" => rawurlencode((string) $form))); } } |