cvs: phd / mktoc.php
| From: | Christian Weiske | Date: | Tue, 28 Oct 2008 18:16:32 +0000 |
| Subject: | cvs: phd / mktoc.php | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-2319@lists.php.net to get a copy of this message | ||
cweiske Tue Oct 28 18:16:32 2008 UTC
Modified files:
/phd mktoc.php
Log:
- Prevent prev/next errors in combination with chunking elements without ids
- Support double nested chunking elements without ids
http://cvs.php.net/viewvc.cgi/phd/mktoc.php?r1=1.17&r2=1.18&diff_format=u
Index: phd/mktoc.php
diff -u phd/mktoc.php:1.17 phd/mktoc.php:1.18
--- phd/mktoc.php:1.17 Fri Oct 24 20:46:29 2008
+++ phd/mktoc.php Tue Oct 28 18:16:31 2008
@@ -29,7 +29,7 @@
* PhDHelper::getRefnameLink(), and allows easy refname->link resolution.
*
* @package PhD
-* @version CVS: $Id: mktoc.php,v 1.17 2008/10/24 20:46:29 loudi Exp $
+* @version CVS: $Id: mktoc.php,v 1.18 2008/10/28 18:16:31 cweiske Exp $
*/
$r = new PhDReader();
@@ -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,