[phpwiki-checkins] SF.net SVN: phpwiki:[10530] trunk

[<var...@us...>]

Revision: 10530
          http://sourceforge.net/p/phpwiki/code/10530
Author:   vargenau
Date:     2021-09-03 07:12:24 +0000 (Fri, 03 Sep 2021)
Log Message:
-----------
Make list of pages work with PDO (~AllPages, ~MostPopular...)

Modified Paths:
--------------
    trunk/lib/WikiDB/backend/PDO.php
    trunk/pgsrc/ReleaseNotes

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2021-09-03 06:52:13 UTC (rev 10529)
+++ trunk/lib/WikiDB/backend/PDO.php	2021-09-03 07:12:24 UTC (rev 10530)
@@ -810,8 +810,7 @@
             . $limit);
         $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100);
         $sth->execute();
-        $result = $sth->fetch(PDO::FETCH_BOTH);
-        return new WikiDB_backend_PDO_iter($this, $result, $this->page_tbl_field_list);
+        return new WikiDB_backend_PDO_iter($this, $sth, $this->page_tbl_field_list);
     }
 
     /*
@@ -890,8 +889,7 @@
         }
         $sth = $dbh->prepare($sql . $limit);
         $sth->execute();
-        $result = $sth->fetch(PDO::FETCH_BOTH);
-        return new WikiDB_backend_PDO_iter($this, $result, $this->page_tbl_field_list);
+        return new WikiDB_backend_PDO_iter($this, $sth, $this->page_tbl_field_list);
     }
 
     /*
@@ -935,8 +933,7 @@
             . $orderby
             . $limit);
         $sth->execute();
-        $result = $sth->fetch(PDO::FETCH_NUM);
-        $iter = new WikiDB_backend_PDO_iter($this, $result, $field_list);
+        $iter = new WikiDB_backend_PDO_iter($this, $sth, $field_list);
         $iter->stoplisted = $searchobj->stoplisted;
         return $iter;
     }
@@ -990,8 +987,7 @@
             $sth = $dbh->prepare($sql);
         }
         $sth->execute();
-        $result = $sth->fetch(PDO::FETCH_NUM);
-        return new WikiDB_backend_PDO_iter($this, $result, $this->page_tbl_field_list);
+        return new WikiDB_backend_PDO_iter($this, $sth, $this->page_tbl_field_list);
     }
 
     /*
@@ -1063,8 +1059,7 @@
             $sth = $dbh->prepare($sql);
         }
         $sth->execute();
-        $result = $sth->fetch(PDO::FETCH_NUM);
-        return new WikiDB_backend_PDO_iter($this, $result,
+        return new WikiDB_backend_PDO_iter($this, $sth,
             array_merge($this->page_tbl_field_list, $this->version_tbl_field_list));
     }
 
@@ -1108,8 +1103,7 @@
             $sth = $dbh->prepare($sql);
         }
         $sth->execute();
-        $result = $sth->fetch(PDO::FETCH_NUM);
-        return new WikiDB_backend_PDO_iter($this, $result, array('pagename', 'wantedfrom'));
+        return new WikiDB_backend_PDO_iter($this, $sth, array('pagename', 'wantedfrom'));
     }
 
     /**

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2021-09-03 06:52:13 UTC (rev 10529)
+++ trunk/pgsrc/ReleaseNotes	2021-09-03 07:12:24 UTC (rev 10530)
@@ -1,4 +1,4 @@
-Date: Wed, 11 Aug 2021 10:03:04 +0000
+Date: Fri,  3 Sep 2021 09:09:27 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -8,6 +8,11 @@
 
 <<CreateToc with_toclink||=1 headers||=1,2,3 width=300px position=right>>
 
+== 1.6.1 2021-XX-XX Marc-Etienne Vargenau ==
+
+=== Fixes ===
+* Make list of pages work with PDO (~AllPages, ~MostPopular...)
+
 == 1.6.0 2021-08-12 Marc-Etienne Vargenau ==
 
 Major release:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.