summaryrefslogtreecommitdiff
path: root/modules/gallery/controllers/user_profile.php
diff options
context:
space:
mode:
authormamouneyya <mamoun.diraneyya@gmail.com>2010-08-02 05:45:48 +0300
committermamouneyya <mamoun.diraneyya@gmail.com>2010-08-02 05:45:48 +0300
commit0a128bab0a788288c5291491a68bd1c9ab432825 (patch)
tree29e9887258865343dc1a6e6322a3933cf6527c61 /modules/gallery/controllers/user_profile.php
parent8e1ae7549362688dd38e053dd736ddc5fc6a4982 (diff)
parent9369fd55a36183b7dc1e4b42af46a8f649a66578 (diff)
Merge remote branch 'gallery3/master'
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));
}
}
}