cvs: phd(PHD_0_4) / mktoc.php

From: Date: Fri, 07 Nov 2008 23:42:53 +0000
Subject: cvs: phd(PHD_0_4) / mktoc.php
Groups: php.doc.cvs 
Request: Send a blank email to doc-cvs+get-2479@lists.php.net to get a copy of this message
cweiske Fri Nov 7 23:42:53 2008 UTC Modified files: (Branch: PHD_0_4) /phd mktoc.php Log: Merge chunking-elements-without-ids fix to 0_4 http://cvs.php.net/viewvc.cgi/phd/mktoc.php?r1=1.10.2.1.2.5&r2=1.10.2.1.2.6&diff_format=u Index: phd/mktoc.php diff -u phd/mktoc.php:1.10.2.1.2.5 phd/mktoc.php:1.10.2.1.2.6 --- phd/mktoc.php:1.10.2.1.2.5 Sun Oct 26 00:00:26 2008 +++ phd/mktoc.php Fri Nov 7 23:42:53 2008 @@ -29,7 +29,7 @@ * PhDHelper::getRefnameLink(), and allows easy refname->link resolution. * * @package PhD -* @version CVS: $Id: mktoc.php,v 1.10.2.1.2.5 2008/10/26 00:00:26 loudi Exp $ +* @version CVS: $Id: mktoc.php,v 1.10.2.1.2.6 2008/11/07 23:42:53 cweiske Exp $ */ $r = new PhDReader($OPTIONS); @@ -90,6 +90,7 @@ case PhDReader::CLOSE_CHUNK: $LAST_CHUNK = array_pop($FILENAMES); $CURRENT_FILENAME = end($FILENAMES); + unset($PARENTS[$r->depth]); $IDs[$CURRENT_FILENAME]["children"][$LAST_CHUNK] = $IDs[$LAST_CHUNK]; @@ -106,7 +107,10 @@ "parent" => $r->isChunk ? (isset($PARENTS[$r->depth-1]) ? $PARENTS[$r->depth-1] - : $PARENTS[$r->depth-2] + : (isset($PARENTS[$r->depth-2]) + ? $PARENTS[$r->depth-2] + : $PARENTS[$r->depth-3] + ) ) : $CURRENT_FILENAME, "sdesc" => null,

« previous php.doc.cvs (#2479) next »