svn: /phd/trunk/ package.xml phpdotnet/phd/Package/Generic/XHTML.php phpdotnet/phd/Package/PHP/XHTML.php
| From: | Hannes Magnusson | Date: | Mon, 18 Apr 2011 14:01:04 +0000 |
| Subject: | svn: /phd/trunk/ package.xml phpdotnet/phd/Package/Generic/XHTML.php phpdotnet/phd/Package/PHP/XHTML.php | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-7968@lists.php.net to get a copy of this message | ||
bjori Mon, 18 Apr 2011 14:01:04 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=310313
Log:
Properly restore the default chunk data when creating "container chunks"
fixes bug#52664
Bug: http://bugs.php.net/52664 (Open) Missing Example #1
Changed paths:
U phd/trunk/package.xml
U phd/trunk/phpdotnet/phd/Package/Generic/XHTML.php
U phd/trunk/phpdotnet/phd/Package/PHP/XHTML.php
Modified: phd/trunk/package.xml
===================================================================
--- phd/trunk/package.xml 2011-04-18 13:56:01 UTC (rev 310312)
+++ phd/trunk/package.xml 2011-04-18 14:01:04 UTC (rev 310313)
@@ -76,6 +76,7 @@
- New translations:
- Spanish (Pablo Bangueses)
- Serbian (Nikola Smolenski)
+ - Fixed bug#52664 - "Missing" example#1. (Hannes)
</notes>
<contents>
Modified: phd/trunk/phpdotnet/phd/Package/Generic/XHTML.php
===================================================================
--- phd/trunk/phpdotnet/phd/Package/Generic/XHTML.php 2011-04-18 13:56:01 UTC (rev 310312)
+++ phd/trunk/phpdotnet/phd/Package/Generic/XHTML.php 2011-04-18 14:01:04 UTC (rev 310313)
@@ -829,7 +829,7 @@
$str .= $note["str"];
$str .= "</div>\n";
}
- $this->cchunk["footnote"] = $this->dchunk["footnote"];
+ $this->cchunk = $this->dchunk;
return $str. "</div>";
}
Modified: phd/trunk/phpdotnet/phd/Package/PHP/XHTML.php
===================================================================
--- phd/trunk/phpdotnet/phd/Package/PHP/XHTML.php 2011-04-18 13:56:01 UTC (rev 310312)
+++ phd/trunk/phpdotnet/phd/Package/PHP/XHTML.php 2011-04-18 14:01:04 UTC (rev 310313)
@@ -462,12 +462,12 @@
public function format_container_chunk($open, $name, $attrs, $props) {
$this->CURRENT_CHUNK = $this->CURRENT_ID = $id =
$attrs[Reader::XMLNS_XML]["id"];
+ if (!isset($attrs[Reader::XMLNS_PHD]["chunk"]) ||
$attrs[Reader::XMLNS_PHD]["chunk"] == "true") {
+ $this->cchunk = $this->dchunk;
+ }
if ($open) {
$this->notify(Render::CHUNK, Render::OPEN);
- if ($props["isChunk"]) {
- $this->cchunk = $this->dchunk;
- }
if ($name != "reference") {
$chunks = Format::getChildren($id);
if (!count($chunks)) {