diff options
| author | kondou <kondou@ts.unde.re> | 2013-08-20 17:20:30 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-08-20 17:20:30 +0200 |
| commit | f1518a54dffb4a309da3952e154b71d4bc9482f8 (patch) | |
| tree | b6faeec269eb8904c5c8f42732e5466758fdeb0e /settings/admin.php | |
| parent | 65d802329f8307cd010a306073d2d3ffd7dc7b74 (diff) | |
| parent | de949b1caa4491a8016ed5e609fc781526fea54d (diff) | |
| download | nextcloud-server-f1518a54dffb4a309da3952e154b71d4bc9482f8.tar.gz nextcloud-server-f1518a54dffb4a309da3952e154b71d4bc9482f8.zip | |
Merge branch 'master' into clean_up_util
Conflicts:
lib/util.php
Diffstat (limited to 'settings/admin.php')
| -rwxr-xr-x | settings/admin.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/settings/admin.php b/settings/admin.php index 0cbb98756db..dd36790907d 100755 --- a/settings/admin.php +++ b/settings/admin.php @@ -18,7 +18,7 @@ $forms=OC_App::getForms('admin'); $htaccessworking=OC_Util::isHtAccessWorking(); $entries=OC_Log_Owncloud::getEntries(3); -$entriesremain=(count(OC_Log_Owncloud::getEntries(4)) > 3)?true:false; +$entriesremain = count(OC_Log_Owncloud::getEntries(4)) > 3; $tmpl->assign('loglevel', OC_Config::getValue( "loglevel", 2 )); $tmpl->assign('entries', $entries); |