Don't show warning when has_internet_connection is set to false

Revert

Add disabled

diff --git a/settings/admin.php b/settings/admin.php
index cf37726189b8284697410372abb96f33279fcb9b..65deed6b8835fd2f04bd6b87e0262d62603f3a5e 100755 (executable)
--- 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 1f3701778ab8d18b062a40d99e104e629f0727b0..0e6cb14bcef08dfc1b2537894b5959f45db7146a 100644 (file)
--- 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>