cvs: phd(PHD_ENTERPRISE) /formats xhtml.php
| From: | Rudy Nappée | Date: | Fri, 01 Aug 2008 16:35:52 +0000 |
| Subject: | cvs: phd(PHD_ENTERPRISE) /formats xhtml.php | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-1976@lists.php.net to get a copy of this message | ||
loudi Fri Aug 1 16:35:52 2008 UTC
Modified files: (Branch: PHD_ENTERPRISE)
/phd/formats xhtml.php
Log:
* minor fix (SQLite3_result to SQLite3Result for 5.3.0alpha1)
http://cvs.php.net/viewvc.cgi/phd/formats/xhtml.php?r1=1.68.2.5&r2=1.68.2.6&diff_format=u
Index: phd/formats/xhtml.php
diff -u phd/formats/xhtml.php:1.68.2.5 phd/formats/xhtml.php:1.68.2.6
--- phd/formats/xhtml.php:1.68.2.5 Fri Aug 1 11:02:03 2008
+++ phd/formats/xhtml.php Fri Aug 1 16:35:52 2008
@@ -1,5 +1,5 @@
<?php
-/* $Id: xhtml.php,v 1.68.2.5 2008/08/01 11:02:03 loudi Exp $ */
+/* $Id: xhtml.php,v 1.68.2.6 2008/08/01 16:35:52 loudi Exp $ */
class PhDXHTMLFormat extends PhDFormat {
private $simpleName = "XHTML";
private $myelementmap = array( /* {{{ */
@@ -532,7 +532,7 @@
$parentId = $this->getParent($for);
return array("href" => $this->getFilename($parentId), "desc"
=> $this->getLongDescription($parentId));
}
- protected function createTOC(SQLite3_result $result) {
+ protected function createTOC(SQLite3Result $result) {
$toc = '<ol>';
$desc = $title = "";
while ($row = $result->fetchArray()) {
@@ -777,7 +777,7 @@
if ($open) {
if (!NO_SQLITE) {
- $this->CHILDRENS = $this->sqlite->query("SELECT docbook_id, filename,
sdesc, ldesc FROM ids WHERE parent_id='$id' AND
filename=docbook_id")->fetchArray(SQLITE3_ASSOC);
+ $this->CHILDRENS = $this->sqlite->query("SELECT docbook_id, filename,
sdesc, ldesc FROM ids WHERE parent_id='$id' AND filename=docbook_id");
}
$this->CURRENT_CHUNK = $id;
$this->notify(PhDRender::CHUNK, PhDRender::OPEN);
@@ -788,8 +788,8 @@
$toc = '<ol>';
$desc = "";
$rsl = $this->CHILDRENS;
- foreach($rsl as $row) {
- $link = $this->createLink($row["docbook_id"], $desc);
+ while ($child = $rsl->fetchArray(SQLITE3_ASSOC)) {
+ $link = $this->createLink($child["docbook_id"], $desc);
$toc .= '<li><a href="' .$link. '">' .$desc.
"</a></li>\n";
}
$toc .= "</ol>\n";