Commit f3d12cda authored by Chris Graham's avatar Chris Graham
Browse files

Fixed MANTIS-4195 (Member export to HTML file (from excel_support addon) is ugly)

parent d76fb288

sources/tasks.php

+5 −10
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ function execute_task_background($task_row) 
        set_mass_import_mode(false);

    }



    // Send notification

    if ($task_row['t_send_notification'] == 1) {

        $attachments = array();
@@ -238,21 +239,15 @@ function call_user_func_array__long_task($plain_title, $title, $hook, $args = nu 
        }



        // HTML result

        if ($mime_type == 'text/html') {

            if (is_array($content_result)) {

                $path = $content_result[1];

                $content_result = file_get_contents($path);

                @unlink($path);

                sync_file($path);

            }



        if (($mime_type == 'text/html') && (!is_array($content_result)/*Not a standalone file because that would have its own conflicting HTML wrapper*/)) {

            $_content_result = is_object($content_result) ? protect_from_escaping($content_result) : protect_from_escaping(make_string_tempcode($content_result));

            if (is_null($title)) {

                return is_object($content_result) ? protect_from_escaping($content_result) : make_string_tempcode($content_result);

                return $_content_result;

            }

            return do_template('FULL_MESSAGE_SCREEN', array(

                '_GUID' => '20e67ceb86e3bbd1e889c6ca116d7a77',

                'TITLE' => $title,

                'TEXT' => is_object($content_result) ? protect_from_escaping($content_result) : make_string_tempcode($content_result),

                'TEXT' => $_content_result,

            ));

        }