diff options
| author | Michael Gapczynski <GapczynskiM@gmail.com> | 2012-05-02 15:26:42 -0400 |
|---|---|---|
| committer | Michael Gapczynski <GapczynskiM@gmail.com> | 2012-05-02 15:26:42 -0400 |
| commit | 31d623f426ac7475588b771036ecfeb2f69b9fe5 (patch) | |
| tree | 644d3392ae94487bcdfc6c666393740387777a45 | |
| parent | 6d37b8567b86af24aaa8d964ca893fb6a5349cd6 (diff) | |
| download | nextcloud-server-31d623f426ac7475588b771036ecfeb2f69b9fe5.tar.gz nextcloud-server-31d623f426ac7475588b771036ecfeb2f69b9fe5.zip | |
Fix log viewing bug
| -rw-r--r-- | lib/log/owncloud.php | 2 | ||||
| -rw-r--r-- | settings/js/log.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/log/owncloud.php b/lib/log/owncloud.php index 881c67d2664..0b7a231d304 100644 --- a/lib/log/owncloud.php +++ b/lib/log/owncloud.php @@ -73,7 +73,7 @@ class OC_Log_Owncloud { $end=max(count($contents)-$offset-1, 0); $start=max($end-$limit,0); $i=$end; - while(count($entries)<$limit){ + while($i>$start){ $entry=json_decode($contents[$i]); if($entry->level>=$minLevel){ $entries[]=$entry; diff --git a/settings/js/log.js b/settings/js/log.js index 5dd9c94ae0c..6063c7d9a9f 100644 --- a/settings/js/log.js +++ b/settings/js/log.js @@ -25,7 +25,6 @@ OC.Log={ $('html, body').animate({scrollTop: $(document).height()}, 800); } }); - OC.Log.loaded+=count; }, addEntries:function(entries){ for(var i=0;i<entries.length;i++){ @@ -48,6 +47,7 @@ OC.Log={ row.append(timeTd); $('#log').append(row); } + OC.Log.loaded += entries.length; } } |