More rewrites/templates swapped out:

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 5e7d2962d2adabc3e0a022d89c4b4fe8ff30dfc3..f010daf758244f3a06b1538c472f104d1515ac69 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2502,7 +2502,7 @@ function generateErrorCodeFromUserStatus ($status='') {
 // Back-ported from the new ship-simu engine. :-)
 function debug_get_printable_backtrace () {
        // Init variable
-       $backtrace = "<ol>\n";
+       $backtrace = '<ol>';
 
        // Get and prepare backtrace for output
        $backtraceArray = debug_backtrace();
@@ -2510,11 +2510,11 @@ function debug_get_printable_backtrace () {
                if (!isset($trace['file'])) $trace['file'] = __FUNCTION__;
                if (!isset($trace['line'])) $trace['line'] = __LINE__;
                if (!isset($trace['args'])) $trace['args'] = array();
-               $backtrace .= "<li class=\"debug_list\"><span class=\"backtrace_file\">".basename($trace['file'])."</span>:" . $trace['line'].", <span class=\"backtrace_function\">" . $trace['function'].'('.count($trace['args']).")</span></li>\n";
+               $backtrace .= '<li class="debug_list"><span class="backtrace_file">' . basename($trace['file']) . '</span>:' . $trace['line'].", <span class=\"backtrace_function\">" . $trace['function'] . '(' . count($trace['args']) . ')</span></li>';
        } // END - foreach
 
        // Close it
-       $backtrace .= "</ol>\n";
+       $backtrace .= '</ol>';
 
        // Return the backtrace
        return $backtrace;
@@ -2566,17 +2566,17 @@ function debug_report_bug ($F, $L, $message = '', $sendEmail = true) {
        } // END - if
 
        // Add output
-       $debug .= "Please report this bug at <a title=\"Direct link to the bug-tracker\" href=\"http://bugs.mxchange.org\" rel=\"external\" target=\"_blank\">http://bugs.mxchange.org</a> and include the logfile from <strong>" . str_replace(getConfig('PATH'), '', getConfig('CACHE_PATH')) . "debug.log</strong> in your report (you can now attach files):<pre>";
+       $debug .= 'Please report this bug at <a title="Direct link to the bug-tracker" href="http://bugs.mxchange.org" rel="external" target="_blank">http://bugs.mxchange.org</a> and include the logfile from <strong>' . str_replace(getConfig('PATH'), '', getConfig('CACHE_PATH')) . 'debug.log</strong> in your report (you can now attach files):<pre>';
        $debug .= debug_get_printable_backtrace();
-       $debug .= "</pre>\nRequest-URI: " . getRequestUri()."<br />\n";
-       $debug .= "Thank you for finding bugs.";
+       $debug .= '</pre>Request-URI: ' . getRequestUri() . '<br />';
+       $debug .= 'Thank you for finding bugs.';
 
        // Send an email? (e.g. not wanted for evaluation errors)
        if (($sendEmail === true) && (!isInstallationPhase())) {
                // Prepare content
                $content = array(
-                       'message'     => trim($message),
-                       'backtrace'   => trim(debug_get_mailable_backtrace())
+                       'message'   => trim($message),
+                       'backtrace' => trim(debug_get_mailable_backtrace())
                );
 
                // Send email to webmaster