From c13a8acbb569a1d866cb7b967bd085e44c6eb116 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 4 Sep 2014 14:18:30 +0200
Subject: [PATCH] Don't show warning when has_internet_connection is set to
false
Revert
Add disabled
---
settings/admin.php | 2 +-
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>