[phpwiki-checkins] CVS: phpwiki/lib PageList.php,1.143,1.144

[Reini U. <ru...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20927

Modified Files:
	PageList.php 
Log Message:
fix column access

Index: PageList.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/PageList.php,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -2 -b -p -d -r1.143 -r1.144
--- PageList.php	14 Jul 2007 12:03:19 -0000	1.143
+++ PageList.php	21 Jul 2007 19:33:43 -0000	1.144
@@ -547,5 +547,6 @@ class PageList {
                   'some' => array('pagename','mtime','author')
                   );
-	if ($this->_options['listtype'] == 'dl')
+	if (isset($this->_options['listtype']) 
+	    and $this->_options['listtype'] == 'dl')
 	    $this->_options['nopage'] = 1;
         if ($columns) {
@@ -817,5 +818,7 @@ class PageList {
         if ($this->isEmpty())
             return $this->_emptyList($caption);
-        elseif (in_array($this->_options['listtype'], array('ol','ul','comma','dl')))
+        elseif (isset($this->_options['listtype']) 
+		and in_array($this->_options['listtype'], 
+			     array('ol','ul','comma','dl')))
             return $this->_generateList($caption);
         elseif (count($this->_columns) == 1)
@@ -1218,6 +1221,6 @@ class PageList {
             	// get column type object
                 if (!is_int($colNum)) { // or column fieldname
-                    if ($temp = $this->_columnsMap[$colNum])
-                        $col = $this->_columns[$temp - 1];
+                    if (isset($this->_columnsMap[$colNum]))
+                        $col = $this->_columns[$this->_columnsMap[$colNum] - 1];
                     elseif (isset($this->_types[$colNum]))
                         $col = $this->_types[$colNum];
@@ -1444,4 +1447,6 @@ function flipAll(formObj) {
     function _generateList($caption='') {
     	if (empty($this->_pages)) return; // stop recursion
+	if (!isset($this->_options['listtype'])) 
+	    $this->_options['listtype'] = '';
         $out = HTML();
         if ($caption)
@@ -1647,4 +1652,7 @@ extends PageList {
 
 // $Log$
+// Revision 1.144  2007/07/21 19:33:43  rurban
+// fix column access
+//
 // Revision 1.143  2007/07/14 12:03:19  rurban
 // support listtype=dl and ranked search