summaryrefslogtreecommitdiff
path: root/inc/RemoteAPICore.php
diff options
context:
space:
mode:
authorGuillaume Turri <guillaume.turri@gmail.com>2013-01-21 21:29:06 +0100
committerGuillaume Turri <guillaume.turri@gmail.com>2013-01-21 21:47:43 +0100
commit05074c7596bd0f90791cb40cf23c9852a777f561 (patch)
tree5e01fc48c585e8b31ae2954f26795569b823022a /inc/RemoteAPICore.php
parent3fed52e12907b55aa9542b8d0da42c3992f8384f (diff)
parentad4665dacc59ec9fd68631764253a87d55ec05b0 (diff)
downloadrpg-05074c7596bd0f90791cb40cf23c9852a777f561.tar.gz
rpg-05074c7596bd0f90791cb40cf23c9852a777f561.tar.bz2
Merge remote-tracking branch 'origin/master' into addedUTests
Hurray, tests pass!
Diffstat (limited to 'inc/RemoteAPICore.php')
-rw-r--r--inc/RemoteAPICore.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/inc/RemoteAPICore.php b/inc/RemoteAPICore.php
index c04a14f5c..fef0b81dd 100644
--- a/inc/RemoteAPICore.php
+++ b/inc/RemoteAPICore.php
@@ -654,7 +654,9 @@ class RemoteAPICore {
if(count($revisions)>0 && $first==0) {
array_unshift($revisions, ''); // include current revision
- array_pop($revisions); // remove extra log entry
+ if ( count($revisions) > $conf['recent'] ){
+ array_pop($revisions); // remove extra log entry
+ }
}
if(count($revisions) > $conf['recent']) {