Exclude directories now

[mailer.git] / inc / ajax-functions.php

diff --git a/inc/ajax-functions.php b/inc/ajax-functions.php
index 1b46e221bb35960c19dc067811c00cbd545ac01e..512b3ae5751883b66b834bf917a08c314cd1c1c8 100644 (file)
--- a/inc/ajax-functions.php
+++ b/inc/ajax-functions.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -48,6 +48,9 @@ function initAjax () {
                'reply_content' => NULL,
        );
 
+       // Init call-back debug information
+       $GLOBALS['ajax_callback_function'] = NULL;
+
        // Set content type (mostly JSON)
        setContentType('application/json');
 
@@ -132,7 +135,7 @@ function sendAjaxContent () {
        // Is the status fine or template not found (404)?
        if (isAjaxHttpStatusAccepted()) {
                // Then output the JSON
-               outputHtml(json_encode($GLOBALS['ajax_reply'], JSON_FORCE_OBJECT));
+               outputHtml(encodeJson($GLOBALS['ajax_reply']));
        } // END - if
 }