[phpwiki-checkins] CVS: phpwiki/lib/plugin UnfoldSubpages.php,1.18,1.19

[Reini U. <ru...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22774/plugin

Modified Files:
	UnfoldSubpages.php 
Log Message:
clarify $ct

Index: UnfoldSubpages.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/UnfoldSubpages.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -2 -b -p -d -r1.18 -r1.19
--- UnfoldSubpages.php	6 Dec 2004 19:50:05 -0000	1.18
+++ UnfoldSubpages.php	21 Jan 2005 14:12:48 -0000	1.19
@@ -2,5 +2,5 @@
 rcs_id('$Id$');
 /*
- Copyright 2002, 2004 $ThePhpWikiProgrammingTeam
+ Copyright 2002,2004,2005 $ThePhpWikiProgrammingTeam
 
  This file is part of PhpWiki.
@@ -100,8 +100,7 @@ extends WikiPlugin
                 $p = $dbi->getPage($page);
                 $r = $p->getCurrentRevision();
-                $c = $r->getContent();
-                $ct = implode("\n", $c);
+                $c = $r->getContent();   // array of lines
                 // trap recursive redirects
-                if (preg_match('/<'.'\?plugin\s+RedirectTo\s+page=(\w+)\s+\?'.'>/',$ct,$m)) {
+                if (preg_match('/<'.'\?plugin\s+RedirectTo\s+page=(\w+)\s+\?'.'>/', implode("\n", $c), $m)) {
                     if (in_array($m[1], $included_pages)) {
                         //$content->pushContent(HTML::p(sprintf(_("recursive inclusion of page %s ignored"),
@@ -123,8 +122,9 @@ extends WikiPlugin
                             . sprintf(_(" ... first %d bytes"), $bytes);
                 }
+                $ct = implode("\n", $c); // one string
 
                 array_push($included_pages, $page);
                 if ($smalltitle) {
-                    $pname = array_pop(explode("/", $page)); // get last subpage name
+                    $pname = array_pop(explode(SUBPAGE_SEPARATOR, $page)); // get last subpage name
                     // Use _("%s: %s") instead of .": ". for French punctuation
                     $ct = TransformText(sprintf(_("%s: %s"), "[$pname|$page]",
@@ -152,4 +152,7 @@ extends WikiPlugin
 
 // $Log$
+// Revision 1.19  2005/01/21 14:12:48  rurban
+// clarify $ct
+//
 // Revision 1.18  2004/12/06 19:50:05  rurban
 // enable action=remove which is undoable and seeable in RecentChanges: ADODB ony for now.