mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9890 from owncloud/check-php-charset-master 

setting and checking default_charset in php.ini to be UTF-8
This commit is contained in:
Thomas Müller 2014-08-11 22:11:11 +02:00
parent 6aa8693198 691306cf4e
commit 3e493501da
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/private/util.php
View File

@ -1467,4 +1467,11 @@ class OC_Util {
return false;
}
}
/**
* @return string
*/
public static function isPhpCharSetUtf8() {
return ini_get('default_charset') === 'UTF-8';
}
}

1
settings/admin.php
View File

@ -39,6 +39,7 @@ $tmpl->assign('entriesremain', $entriesremain);
$tmpl->assign('htaccessworking', $htaccessworking);
$tmpl->assign('internetconnectionworking', OC_Util::isInternetConnectionEnabled() ? OC_Util::isInternetConnectionWorking() : false);
$tmpl->assign('isLocaleWorking', OC_Util::isSetLocaleWorking());
$tmpl->assign('isPhpCharSetUtf8', OC_Util::isPhpCharSetUtf8());
$tmpl->assign('isAnnotationsWorking', OC_Util::isAnnotationsWorking());
$tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking());
$tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded());

14
settings/templates/admin.php
View File

@ -140,6 +140,20 @@ if ($_['old_php']) {
<?php
}
// is PHP charset set to UTF8?
if (!$_['isPhpCharSetUtf8']) {
?>
<div class="section">
<h2><?php p($l->t('PHP charset is not set to UTF-8'));?></h2>
<span class="connectionwarning">
<?php p($l->t("PHP charset is not set to UTF-8. This can cause major issues with non-acsii characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'.")); ?>
</span>
</div>
<?php
}
// is locale working ?
if (!$_['isLocaleWorking']) {
?>