Merge pull request #10863 from owncloud/removeWarningWhenCheckIsDisabled

Add new check_for_working_internet configuration switch
This commit is contained in:
VicDeo 2014-09-09 01:50:33 +03:00
commit ae7f632a1a
2 changed files with 2 additions and 2 deletions

View file

@ -38,7 +38,7 @@ $tmpl->assign('mail_smtppassword', OC_Config::getValue( "mail_smtppassword", ''
$tmpl->assign('entries', $entries);
$tmpl->assign('entriesremain', $entriesremain);
$tmpl->assign('htaccessworking', $htaccessworking);
$tmpl->assign('internetconnectionworking', OC_Util::isInternetConnectionEnabled() ? OC_Util::isInternetConnectionWorking() : false);
$tmpl->assign('internetconnectionworking', OC_Util::isInternetConnectionEnabled() ? OC_Util::isInternetConnectionWorking() : 'disabled');
$tmpl->assign('isLocaleWorking', OC_Util::isSetLocaleWorking());
$tmpl->assign('isPhpCharSetUtf8', OC_Util::isPhpCharSetUtf8());
$tmpl->assign('isAnnotationsWorking', OC_Util::isAnnotationsWorking());

View file

@ -184,7 +184,7 @@ if (!$_['isLocaleWorking']) {
}
// is internet connection working ?
if (!$_['internetconnectionworking']) {
if ($_['internetconnectionworking'] === false) {
?>
<div class="section">
<h2><?php p($l->t('Internet connection not working'));?></h2>