From 0b44f4f7421aa5a922302b042cc26cb10a044bf9 Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Wed, 9 Jun 2010 12:08:08 +0000
Subject: [PATCH] fix cosmetic warnings

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@7510 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/PageList.php | 6 +++---
 lib/stdlib.php   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/PageList.php b/lib/PageList.php
index 61b690704..5ea4f1bc1 100644
--- a/lib/PageList.php
+++ b/lib/PageList.php
@@ -843,11 +843,11 @@ class PageList {
     function addPages ($page_iter) {
         // TODO: if limit check max(strlen(pagename))
 	$limit = $page_iter->limit();
+        $i = 0;
 	if ($limit) {
 	    list($from, $limit) = $this->limit($limit);
 	    $this->_options['slice'] = 0;
 	    $limit += $from;
-	    $i = 0;
             while ($page = $page_iter->next()) {
                 $i++;
                 if ($from and $i < $from) 
@@ -861,7 +861,7 @@ class PageList {
 		$this->addPage($page);
             }
 	}
-        if (empty($this->_options['count']))
+        if ($i and empty($this->_options['count']))
 	    $this->_options['count'] = $i;
     }
 
@@ -1480,7 +1480,7 @@ class PageList {
             $tokens = $this->pagingTokens($count, 
                                            count($this->_columns), 
                                            $this->_options['limit']);
-            if ($tokens and $this->_options['slice'])
+            if ($tokens and !empty($this->_options['slice']))
                 $this->_pages = array_slice($this->_pages, $tokens['OFFSET'], $tokens['COUNT']);
         }
         foreach ($this->_pages as $pagenum => $page) {
diff --git a/lib/stdlib.php b/lib/stdlib.php
index c99787f4b..248a79731 100644
--- a/lib/stdlib.php
+++ b/lib/stdlib.php
@@ -1,4 +1,4 @@
-<?php //// rcs_id('$Id$');
+<?php // rcs_id('$Id$');
 /*
  * Copyright 1999-2008 $ThePhpWikiProgrammingTeam
  * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
-- 
2.45.0