diff options
author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-05 13:39:45 +0200 |
---|---|---|
committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-05 13:39:45 +0200 |
commit | f8563ec5831713b341db1b2cd480328912818607 (patch) | |
tree | 49c37ae10321b8490cb9d87104422f8a460c6301 /settings/admin.php | |
parent | fd7469db9e1cd1fd85e3a8a18aac87c7040ec8e7 (diff) | |
parent | 0527fb05ad4106db199bf3937b753563061c39bf (diff) | |
download | nextcloud-server-f8563ec5831713b341db1b2cd480328912818607.tar.gz nextcloud-server-f8563ec5831713b341db1b2cd480328912818607.zip |
Merge branch 'master' into sharing_mail_notification_master
increased version number to trigger db update
Conflicts:
lib/util.php
Diffstat (limited to 'settings/admin.php')
-rwxr-xr-x | settings/admin.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/settings/admin.php b/settings/admin.php index 38b77a615dd..120f15bec19 100755 --- a/settings/admin.php +++ b/settings/admin.php @@ -15,7 +15,7 @@ OC_App::setActiveNavigationEntry( "admin" ); $tmpl = new OC_Template( 'settings', 'admin', 'user'); $forms=OC_App::getForms('admin'); -$htaccessworking=OC_Util::ishtaccessworking(); +$htaccessworking=OC_Util::isHtAccessWorking(); $entries=OC_Log_Owncloud::getEntries(3); $entriesremain = count(OC_Log_Owncloud::getEntries(4)) > 3; @@ -25,7 +25,7 @@ $tmpl->assign('entries', $entries); $tmpl->assign('entriesremain', $entriesremain); $tmpl->assign('htaccessworking', $htaccessworking); $tmpl->assign('internetconnectionworking', OC_Util::isInternetConnectionEnabled() ? OC_Util::isInternetConnectionWorking() : false); -$tmpl->assign('islocaleworking', OC_Util::issetlocaleworking()); +$tmpl->assign('islocaleworking', OC_Util::isSetLocaleWorking()); $tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking()); $tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded()); $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax')); |