Fixed auto-display of system errors in ajax actions. Fixed docs for system_messages...

git-svn-id: http://code.elgg.org/elgg/trunk@8879 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 7076ec12d0d50fcf1e32493f745bc08f3817745e..87866f3182b947e14c5fb00f1f6cf7803cef6a4f 100644 (file)
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -496,7 +496,7 @@ function sanitise_filepath($path, $append_slash = TRUE) {
  * 'messages') as well as {@link register_error()} messages ($register = 'errors').
  *
  * @param mixed  $message  Optionally, a single message or array of messages to add, (default: null)
- * @param string $register Types of message: "errors", "messages" (default: messages)
+ * @param string $register Types of message: "error", "success" (default: success)
  * @param bool   $count    Count the number of messages (default: false)
  *
  * @return true|false|array Either the array of messages, or a response regarding

diff --git a/js/lib/ajax.js b/js/lib/ajax.js
index 5e290df6fe1aa9c6ef711b5c58d73acd4ce0f0cb..6f6ae052f71371f481ce9859d7c434446dab627c 100644 (file)
--- a/js/lib/ajax.js
+++ b/js/lib/ajax.js
@@ -194,7 +194,7 @@ elgg.action = function(action, options) {
        var custom_success = options.success || elgg.nullFunction;
        options.success = function(json, two, three, four) {
                if (json && json.system_messages) {
-                       elgg.register_error(json.system_messages.errors);
+                       elgg.register_error(json.system_messages.error);
                        elgg.system_message(json.system_messages.success);
                }