diff options
| author | Christian Schneider | 2015-08-12 15:27:39 +0200 |
|---|---|---|
| committer | Christian Schneider | 2015-08-12 15:27:39 +0200 |
| commit | 1c0a580ec4de036530b08a83d5ddc2d915bdfd0b (patch) | |
| tree | da17deffd92927957246b5f3cb13393c853f0446 /it.class | |
| parent | 0bb7f6148acb2a4a4d2caaa83c9ffa5b27aa8e1c (diff) | |
| parent | 79d5a50477ed74940484a5ca046dfa04adce1550 (diff) | |
| download | itools-1c0a580ec4de036530b08a83d5ddc2d915bdfd0b.tar.gz itools-1c0a580ec4de036530b08a83d5ddc2d915bdfd0b.tar.bz2 itools-1c0a580ec4de036530b08a83d5ddc2d915bdfd0b.zip | |
Merge branch 'master' into cs/php7
Diffstat (limited to 'it.class')
| -rw-r--r-- | it.class | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -266,7 +266,7 @@ static function fatal($p) it::error($p); if ($_SERVER['REMOTE_ADDR']) header("HTTP/1.0 500 Internal Server Error"); - exit(1); + exit(99); } @@ -429,8 +429,8 @@ static function any2utf8($value, $errprefix = "") if (is_array($value)) { foreach ($value as $idx => $v) - if (is_string($v) || is_array($v)) - $value[$idx] = self::any2utf8($v, $errprefix); + $newarr[self::any2utf8($idx)] = is_string($v) || is_array($v) ? self::any2utf8($v, $errprefix) : $v; + $value = (array)$newarr; } else if (is_string($value)) { |