From: Reini U. <ru...@us...> - 2004-01-25 10:53:18
|
Update of /cvsroot/phpwiki/phpwiki/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23152 Modified Files: PageList.php stdlib.php Log Message: added sortby support to explodePageList() and UnfoldSubpages fixes [ 758044 ] Plugin UnfoldSubpages does not sort (includes fix) Index: PageList.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/PageList.php,v retrieving revision 1.47 retrieving revision 1.48 diff -u -2 -b -p -d -r1.47 -r1.48 --- PageList.php 25 Jan 2004 07:58:29 -0000 1.47 +++ PageList.php 25 Jan 2004 10:52:18 -0000 1.48 @@ -32,9 +32,5 @@ * that some older revisions (include revision 1) have been cleaned (deleted). * - * FIXME: - * The 'sortby' option is handled here correctly, but at the backends at - * the page iterator not yet. - * - * TODO: order, sortby, limit, offset, rows arguments for multiple pages/multiple rows. + * TODO: limit, offset, rows arguments for multiple pages/multiple rows. */ class _PageList_Column_base { Index: stdlib.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v retrieving revision 1.154 retrieving revision 1.155 diff -u -2 -b -p -d -r1.154 -r1.155 --- stdlib.php 25 Jan 2004 03:49:03 -0000 1.154 +++ stdlib.php 25 Jan 2004 10:52:22 -0000 1.155 @@ -1127,9 +1127,9 @@ function explodeList($input, $allnames, // echo implode(":",explodeList("Test*",array("xx","Test1","Test2"))); -function explodePageList($input, $perm = false) { +function explodePageList($input, $perm = false, $orderby = 'pagename') { // expand wildcards from list of all pages if (preg_match('/[\?\*]/',$input)) { $dbi = $GLOBALS['request']->_dbi; - $allPagehandles = $dbi->getAllPages($perm); + $allPagehandles = $dbi->getAllPages($perm,$orderby); while ($pagehandle = $allPagehandles->next()) { $allPages[] = $pagehandle->getName(); @@ -1347,4 +1347,8 @@ function isWikiWord($word) { // $Log$ +// Revision 1.155 2004/01/25 10:52:22 rurban +// added sortby support to explodePageList() and UnfoldSubpages +// fixes [ 758044 ] Plugin UnfoldSubpages does not sort (includes fix) +// // Revision 1.154 2004/01/25 03:49:03 rurban // added isWikiWord() to avoid redundancy |