|
CVS: phpwiki/lib/plugin AllPages.php,1.35,1.36: msg#00173web.wiki.phpwiki.checkins
Update of /cvsroot/phpwiki/phpwiki/lib/plugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24027/plugin Modified Files: AllPages.php Log Message: dont print [] as user Index: AllPages.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/AllPages.php,v retrieving revision 1.35 retrieving revision 1.36 diff -u -2 -b -p -d -r1.35 -r1.36 --- AllPages.php 6 Dec 2004 19:50:04 -0000 1.35 +++ AllPages.php 28 Jan 2005 12:08:42 -0000 1.36 @@ -2,5 +2,5 @@ rcs_id('$Id$'); /** - Copyright 1999, 2000, 2001, 2002, 2004 $ThePhpWikiProgrammingTeam + Copyright 1999,2000,2001,2002,2004,2005 $ThePhpWikiProgrammingTeam This file is part of PhpWiki. @@ -72,25 +72,38 @@ extends WikiPlugin if ( !empty($args['owner']) ) { - $pages = PageList::allPagesByOwner($args['owner'],$args['include_empty'],$args['sortby'],$args['limit']); + $pages = PageList::allPagesByOwner($args['owner'], $args['include_empty'], + $args['sortby'], $args['limit']); if ($args['owner']) $caption = fmt("List of pages owned by [%s] (%d total):", - WikiLink($args['owner'], 'if_known'), + WikiLink($args['owner'] == '[]' + ? $request->_user->getAuthenticatedId() + : $args['owner'], + 'if_known'), count($pages)); } elseif ( !empty($args['author']) ) { - $pages = PageList::allPagesByAuthor($args['author'],$args['include_empty'],$args['sortby'],$args['limit']); + $pages = PageList::allPagesByAuthor($args['author'], $args['include_empty'], + $args['sortby'], $args['limit']); if ($args['author']) $caption = fmt("List of pages last edited by [%s] (%d total):", - WikiLink($args['author'], 'if_known'), + WikiLink($args['author'] == '[]' + ? $request->_user->getAuthenticatedId() + : $args['author'], + 'if_known'), count($pages)); } elseif ( !empty($args['creator']) ) { - $pages = PageList::allPagesByCreator($args['creator'],$args['include_empty'],$args['sortby'],$args['limit']); + $pages = PageList::allPagesByCreator($args['creator'], $args['include_empty'], + $args['sortby'], $args['limit']); if ($args['creator']) $caption = fmt("List of pages created by [%s] (%d total):", - WikiLink($args['creator'], 'if_known'), + WikiLink($args['creator'] == '[]' + ? $request->_user->getAuthenticatedId() + : $args['creator'], + 'if_known'), count($pages)); //} elseif ($pages) { // $args['count'] = count($pages); } else { - if (! $request->getArg('count')) $args['count'] = $dbi->numPages($args['include_empty'],$args['exclude']); + if (! $request->getArg('count')) + $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']); else $args['count'] = $request->getArg('count'); } @@ -107,5 +120,6 @@ extends WikiPlugin $pagelist->addPageList($pages); else - $pagelist->addPages( $dbi->getAllPages($args['include_empty'], $args['sortby'], $args['limit']) ); + $pagelist->addPages( $dbi->getAllPages($args['include_empty'], $args['sortby'], + $args['limit']) ); if ($args['debug']) { return HTML($pagelist, @@ -123,4 +137,7 @@ extends WikiPlugin // $Log$ +// Revision 1.36 2005/01/28 12:08:42 rurban +// dont print [] as user +// // Revision 1.35 2004/12/06 19:50:04 rurban // enable action=remove which is undoable and seeable in RecentChanges: ADODB ony for now. ------------------------------------------------------- This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting Tool for open source databases. Create drag-&-drop reports. Save time by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc. Download a FREE copy at http://www.intelliview.com/go/osdn_nl |
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| Previous by Date: | CVS: phpwiki/lib PageList.php,1.129,1.130: 00173, Reini Urban |
|---|---|
| Next by Date: | CVS: phpwiki/tests/unit test.php,1.36,1.37: 00173, Reini Urban |
| Previous by Thread: | CVS: phpwiki/lib PageList.php,1.129,1.130i: 00173, Reini Urban |
| Next by Thread: | CVS: phpwiki/tests/unit test.php,1.36,1.37: 00173, Reini Urban |
| Indexes: | [Date] [Thread] [Top] [All Lists] |
| News | FAQ | advertise |