diff options
| author | Florian Pritz <bluewind@xinu.at> | 2017-09-26 13:46:14 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2017-09-26 13:46:14 +0200 |
| commit | 3ff6ffa3341c876b741feb66552cdd110b67872e (patch) | |
| tree | 69e11cd0009ddd1346f2dc4cd8c47244368db28e /application/third_party | |
| parent | bc2f7f596f727e204e8b8c5b849545745b3cbfaa (diff) | |
| parent | 81a4c8c630ef59cffea0c24e64fb6fa7f09bfcf6 (diff) | |
Merge CodeIgniter 3 support
Diffstat (limited to 'application/third_party')
| -rw-r--r-- | application/third_party/index.html | 3 | ||||
| -rwxr-xr-x | application/third_party/test-more-php/Test-More-OO.php | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/application/third_party/index.html b/application/third_party/index.html index c942a79ce..b702fbc39 100644 --- a/application/third_party/index.html +++ b/application/third_party/index.html @@ -1,3 +1,4 @@ +<!DOCTYPE html> <html> <head> <title>403 Forbidden</title> @@ -7,4 +8,4 @@ <p>Directory access is forbidden.</p> </body> -</html>
\ No newline at end of file +</html> diff --git a/application/third_party/test-more-php/Test-More-OO.php b/application/third_party/test-more-php/Test-More-OO.php index 005c7dc01..7ce9f9421 100755 --- a/application/third_party/test-more-php/Test-More-OO.php +++ b/application/third_party/test-more-php/Test-More-OO.php @@ -87,6 +87,11 @@ class TestMore extends TestSimple { $ret = ob_get_clean(); $ret = preg_replace("/^[^\n]*\n/", "", $ret); $ret = preg_replace("/\n$/", "", $ret); + # replace unprintable characters with questionmarks + $old = ini_get("mbstring.substitute_character"); + ini_set("mbstring.substitute_character", "?"); + $ret = mb_convert_encoding($ret, 'UTF-8', 'UTF-8'); + ini_set("mbstring.substitute_character", $old); return $ret; } |