diff options
| -rw-r--r-- | inc/init.php | 2 | ||||
| -rw-r--r-- | inc/utf8.php | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/inc/init.php b/inc/init.php index fb02ab15d..247b16da9 100644 --- a/inc/init.php +++ b/inc/init.php @@ -26,7 +26,7 @@ //load the language files require_once(DOKU_INC.'inc/lang/en/lang.php'); - if ( defined($conf['lang']) ) { + if ( $conf['lang'] && $conf['lang'] != 'en' ) { require_once(DOKU_INC.'inc/lang/'.$conf['lang'].'/lang.php'); } diff --git a/inc/utf8.php b/inc/utf8.php index 3c1f361f7..64100f658 100644 --- a/inc/utf8.php +++ b/inc/utf8.php @@ -409,11 +409,8 @@ function utf8_to_unicode( &$str ) { * @see utf8_to_unicode() */ function unicode_to_utf8( &$str ) { - // init_getID_test causes something to get - // passed to this function that isn't a string - if ( !is_string($str) ) { - return; - } + if (!is_array($str)) return ''; + $utf8 = ''; foreach( $str as $unicode ) { if ( $unicode < 128 ) { |