summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2014-09-04 14:18:30 +0200
committerLukas Reschke <lukas@owncloud.com>2014-09-09 09:20:03 +0200
commitb98c22d39b2ee6c137210f6441f2de2351cfe235 (patch)
tree8014d3654d7f3703bcdfb80b230f45125f8d0c03 /settings
parentb609d36e3cd8f0067b6764afd6715b264c68ef0d (diff)
downloadnextcloud-server-b98c22d39b2ee6c137210f6441f2de2351cfe235.tar.gz
nextcloud-server-b98c22d39b2ee6c137210f6441f2de2351cfe235.zip
Don't show warning when has_internet_connection is set to false
Revert Add disabled
Diffstat (limited to 'settings')
-rwxr-xr-xsettings/admin.php2
-rw-r--r--settings/templates/admin.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/settings/admin.php b/settings/admin.php
index a9f90aca747..3702cf91d8e 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('isAnnotationsWorking', OC_Util::isAnnotationsWorking());
$tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking());
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 5426e10477e..5ee15070283 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -170,7 +170,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>