From 31d623f426ac7475588b771036ecfeb2f69b9fe5 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Wed, 2 May 2012 15:26:42 -0400
Subject: [PATCH] Fix log viewing bug
---
lib/log/owncloud.php | 2 +-
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;
}
}
--
GitLab