diff options
| author | VicDeo <dubiniuk@owncloud.com> | 2014-09-09 01:50:33 +0300 |
|---|---|---|
| committer | VicDeo <dubiniuk@owncloud.com> | 2014-09-09 01:50:33 +0300 |
| commit | ae7f632a1afabfa3d33d27d7b5829af21258ca1d (patch) | |
| tree | f1106e5a947cb1d5adb65d1cab44386770e0a4ea /settings | |
| parent | efd485acda6ee9830d571a5f41e2d049855a1529 (diff) | |
| parent | c13a8acbb569a1d866cb7b967bd085e44c6eb116 (diff) | |
| download | nextcloud-server-ae7f632a1afabfa3d33d27d7b5829af21258ca1d.tar.gz nextcloud-server-ae7f632a1afabfa3d33d27d7b5829af21258ca1d.zip | |
Merge pull request #10863 from owncloud/removeWarningWhenCheckIsDisabled
Add new check_for_working_internet configuration switch
Diffstat (limited to 'settings')
| -rwxr-xr-x | settings/admin.php | 2 | ||||
| -rw-r--r-- | settings/templates/admin.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/settings/admin.php b/settings/admin.php index cf37726189b..65deed6b883 100755 --- a/settings/admin.php +++ b/settings/admin.php @@ -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()); diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 1f3701778ab..0e6cb14bcef 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -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> |