Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2842
Modified Files:
LinkDatabase.php
Log Message:
default format=html for unit-tests and DumpHtml/Zip breakage
Index: LinkDatabase.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/LinkDatabase.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -2 -b -p -d -r1.5 -r1.6
--- LinkDatabase.php 17 Dec 2004 16:39:03 -0000 1.5
+++ LinkDatabase.php 22 Dec 2004 18:48:10 -0000 1.6
@@ -60,5 +60,5 @@ extends WikiPluginCached
PageList::supportedArgs(),
array(
- 'format' => 'text', // or 'html', 'xml'
+ 'format' => 'html', // 'html', 'text', 'xml'
'noheader' => false,
'include_empty' => false,
@@ -73,4 +73,5 @@ extends WikiPluginCached
function run($dbi, $argstr, $request, $basepage) {
+ global $WikiTheme;
$args = $this->getArgs($argstr, $request);
$caption = _("All pages with all links in this wiki (%d total):");
@@ -112,5 +113,5 @@ extends WikiPluginCached
} elseif ($args['format'] == 'text') {
$request->discardOutput();
- $request->buffer_output(COMPRESS_OUTPUT);
+ $request->buffer_output(false);
if (!headers_sent())
header("Content-Type: text/plain");
@@ -126,4 +127,5 @@ extends WikiPluginCached
}
flush();
+ if (empty($WikiTheme->DUMP_MODE) or $WikiTheme->DUMP_MODE != 'HTML')
$request->finish();
} elseif ($args['format'] == 'xml') {
@@ -159,6 +161,8 @@ extends WikiPluginCached
echo "</graph>\n";
echo "</GraphXML>\n";
+ if (empty($WikiTheme->DUMP_MODE) or $WikiTheme->DUMP_MODE != 'HTML') {
unset($GLOBALS['ErrorManager']->_postponed_errors);
$request->finish();
+ }
} else {
return $this->error(fmt("Unsupported format argument %s", $args['format']));
@@ -179,4 +183,7 @@ class _PageList_Column_LinkDatabase_link
// $Log$
+// Revision 1.6 2004/12/22 18:48:10 rurban
+// default format=html for unit-tests and DumpHtml/Zip breakage
+//
// Revision 1.5 2004/12/17 16:39:03 rurban
// minor reformatting
|
