[Pkg-owncloud-commits] [owncloud] 45/258: Don't show warning when has_internet_connection is set to false

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit b98c22d39b2ee6c137210f6441f2de2351cfe235
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Thu Sep 4 14:18:30 2014 +0200

    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 a9f90ac..3702cf9 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 5426e10..5ee1507 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>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git