summaryrefslogtreecommitdiff
path: root/modules/gallery/controllers/user_profile.php
diff options
context:
space:
mode:
authorNathan Kinkade <nkinkade@nkinka.de>2010-08-06 21:36:32 +0000
committerNathan Kinkade <nkinkade@nkinka.de>2010-08-06 21:36:32 +0000
commit691ce806dc9aefac596a692ff2ba927a81a65440 (patch)
tree410f64288ef1d8bbc8455509af74d0e7582dc48e /modules/gallery/controllers/user_profile.php
parentc83650d83ad8b1f4bda30cac2ae8efa6e1c97287 (diff)
parent8559cdb5b6bfa87864941f726521660023779fa7 (diff)
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/gallery/controllers/user_profile.php')
-rw-r--r--modules/gallery/controllers/user_profile.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/controllers/user_profile.php b/modules/gallery/controllers/user_profile.php
index c064e791..726d3e51 100644
--- a/modules/gallery/controllers/user_profile.php
+++ b/modules/gallery/controllers/user_profile.php
@@ -61,9 +61,9 @@ class User_Profile_Controller extends Controller {
->message(html::purify($form->message->message->value))
->send();
message::success(t("Sent message to %user_name", array("user_name" => $user->display_name())));
- print json_encode(array("result" => "success"));
+ json::reply(array("result" => "success"));
} else {
- print json_encode(array("result" => "error", "form" => (string)$form));
+ json::reply(array("result" => "error", "html" => (string)$form));
}
}
}