summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-05-31 17:05:45 -0700
committerThomas Müller <thomas.mueller@tmit.eu>2013-05-31 17:05:45 -0700
commit1b3c9fe5ae8f0767580c38250fd852a2622176b4 (patch)
tree7665a87c72f8ce04bc1b13e814598252ce31e058 /settings
parent3013c027676379ff7156aa400f0d002e269a5104 (diff)
parentdd4a07321a2afa5c86fa4e42fc3e133b4ec91791 (diff)
downloadnextcloud-server-1b3c9fe5ae8f0767580c38250fd852a2622176b4.tar.gz
nextcloud-server-1b3c9fe5ae8f0767580c38250fd852a2622176b4.zip
Merge pull request #3454 from owncloud/fix_hasInternetConnection
isinternetconnectionworking should return false if OC_Config::getValue("has_internet_connection") is false
Diffstat (limited to 'settings')
-rwxr-xr-xsettings/admin.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/settings/admin.php b/settings/admin.php
index 035cef5bf95..db041ef889c 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -24,7 +24,7 @@ $tmpl->assign('loglevel', OC_Config::getValue( "loglevel", 2 ));
$tmpl->assign('entries', $entries);
$tmpl->assign('entriesremain', $entriesremain);
$tmpl->assign('htaccessworking', $htaccessworking);
-$tmpl->assign('internetconnectionworking', OC_Util::isinternetconnectionworking());
+$tmpl->assign('internetconnectionworking', OC_Util::isInternetConnectionEnabled() ? OC_Util::isInternetConnectionWorking() : false);
$tmpl->assign('islocaleworking', OC_Util::issetlocaleworking());
$tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking());
$tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded());