diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-09-12 21:43:35 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-09-12 21:43:35 +0200 |
| commit | c9d26631592ba58d8026a14e7f637cfe835fa15d (patch) | |
| tree | b6bc91006e0207a2e2b26ba5d1205853e0ca7fda /settings/admin.php | |
| parent | b9167196fb331d7197210e4a130e03d32d839b8a (diff) | |
| parent | c7ca86799b2608609ead7ecd2d84d0bbd47c6548 (diff) | |
| download | nextcloud-server-c9d26631592ba58d8026a14e7f637cfe835fa15d.tar.gz nextcloud-server-c9d26631592ba58d8026a14e7f637cfe835fa15d.zip | |
Merge branch 'master' into fileapi-foreward
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 869729a9e41..dd36790907d 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')); |