From 5156b3529dcff875308344c1311d3da4cebda29c Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Sat, 20 Jan 2007 11:25:19 +0000
Subject: [PATCH] actionPage: request is already global

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@5520 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/display.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/display.php b/lib/display.php
index 0c2cc840d..dff421e3a 100644
--- a/lib/display.php
+++ b/lib/display.php
@@ -1,6 +1,6 @@
 <?php
 // display.php: fetch page or get default content
-rcs_id('$Id: display.php,v 1.67 2007-01-07 18:44:20 rurban Exp $');
+rcs_id('$Id: display.php,v 1.68 2007-01-20 11:25:19 rurban Exp $');
 
 require_once('lib/Template.php');
 
@@ -96,7 +96,7 @@ function actionPage(&$request, $action) {
 	        $loader = new WikiPluginLoader;
 	        $markup = null;
 	        // return the first found pagelist
-	        $pagelist = $loader->expandPI($cached_element->_pi, $GLOBALS['request'], $markup, $pagename);
+	        $pagelist = $loader->expandPI($cached_element->_pi, $request, $markup, $pagename);
 	        if (is_a($pagelist, 'PageList'))
 	            break;
 	    }
@@ -367,6 +367,9 @@ function displayPage(&$request, $template=false) {
 }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.67  2007/01/07 18:44:20  rurban
+// Support format handlers for single- and multi-page: pagelists from actionpage plugins. Use USE_SEARCHHIGHLIGHT. Fix InlineHighlight (still experimental).
+//
 // Revision 1.66  2006/03/19 14:26:29  rurban
 // sf.net patch by Matt Brown: Add rel=nofollow to more actions
 //
-- 
2.45.0