Upgrade 1-11.38

main/inc/lib/xajax/xajax.inc.php

@@ -678,7 +678,7 @@ class xajax
 					$sErrorResponse->addAlert("** Logging Error **\n\nxajax was unable to write to the error log file:\n" . $this->sLogFile);
 				}
 				else {
-					fwrite($fH, "** xajax Error Log - " . strftime("%b %e %Y %I:%M:%S %p") . " **" . $GLOBALS['xajaxErrorHandlerText'] . "\n\n\n");
+					fwrite($fH, "** xajax Error Log - " . date("M j Y g:i:s A") . " **" . $GLOBALS['xajaxErrorHandlerText'] . "\n\n\n");
 					fclose($fH);
 				}
 			}
@@ -1163,7 +1163,7 @@ function xajaxErrorHandler($errno, $errstr, $errfile, $errline)
 	else if ($errno == E_USER_ERROR) {
 		$errTypeStr = "USER FATAL ERROR";
 	}
-	else if ($errno == E_STRICT) {
+	else if (defined('E_STRICT') && $errno == E_STRICT) {
 		return;
 	}
 	else {

main/inc/lib/xajax/xajaxResponse.inc.php

@@ -535,9 +535,10 @@ class xajaxResponse
         if ($this->bOutputEntities) {
             // An adaptation for the Dokeos LMS, 22-AUG-2009.
             if (function_exists('api_convert_encoding')) {
-                $sData = call_user_func_array(
-                    'api_convert_encoding',
-                    array(&$sData, 'HTML-ENTITIES', $this->sEncoding)
+                $sData = mb_encode_numericentity(
+                    mb_convert_encoding($sData, 'UTF-8', $this->sEncoding),
+                    [0x80, 0x10FFFF, 0, 0x1FFFFF],
+                    'UTF-8'
                 );
             } //if (function_exists('mb_convert_encoding')) {
             elseif (function_exists('mb_convert_encoding')) {