diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-06-13 09:59:27 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-06-13 09:59:27 -0700 |
| commit | 938eea7fc45d5ad26529a14f349b7e4be2fecb15 (patch) | |
| tree | 903f5fd467565b16e7e65d84101060920b1449b7 /modules/watermark/controllers | |
| parent | 0ebc36b4e5ef5578791c00b8a64021d3aad96068 (diff) | |
| parent | 87f8b6ff0a76f51183f14515723a8345f7c14fa6 (diff) | |
Merge branch 'master' into talmdal_dev
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))); } } |