cvs: phd(PHD_0_4) /themes/pear pearchunkedhtml.php
| From: | Christian Weiske | Date: | Fri, 07 Nov 2008 22:23:24 +0000 |
| Subject: | cvs: phd(PHD_0_4) /themes/pear pearchunkedhtml.php | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-2471@lists.php.net to get a copy of this message | ||
cweiske Fri Nov 7 22:23:24 2008 UTC
Modified files: (Branch: PHD_0_4)
/phd/themes/pear pearchunkedhtml.php
Log:
Merge changes from head back
http://cvs.php.net/viewvc.cgi/phd/themes/pear/pearchunkedhtml.php?r1=1.5.2.2.2.1&r2=1.5.2.2.2.2&diff_format=u
Index: phd/themes/pear/pearchunkedhtml.php
diff -u phd/themes/pear/pearchunkedhtml.php:1.5.2.2.2.1
phd/themes/pear/pearchunkedhtml.php:1.5.2.2.2.2
--- phd/themes/pear/pearchunkedhtml.php:1.5.2.2.2.1 Sun Oct 19 13:55:05 2008
+++ phd/themes/pear/pearchunkedhtml.php Fri Nov 7 22:23:24 2008
@@ -5,12 +5,21 @@
* PEAR theme for the normal-html-in-many-files version
*
* @package PhD
-* @version CVS: $Id: pearchunkedhtml.php,v 1.5.2.2.2.1 2008/10/19 13:55:05 bjori Exp $
+* @version CVS: $Id: pearchunkedhtml.php,v 1.5.2.2.2.2 2008/11/07 22:23:24 cweiske Exp $
*/
class pearchunkedhtml extends pearweb
{
private $nav = "";
+ /**
+ * URL prefix for all API doc link generated with <phd:pearapi>
+ *
+ * @var string
+ */
+ public $phd_pearapi_urlprefix = 'http://pear.php.net/package/';
+
+
+
public function __construct(array $IDs, $ext = "html")
{
parent::__construct($IDs, $ext, true);
@@ -34,7 +43,7 @@
*/
public function header($id)
{
- $title = PhDHelper::getDescription($id, true);
+ $title = htmlspecialchars(PhDHelper::getDescription($id));
$parent = PhDHelper::getParent($id);
$this->next = $this->prev = $this->up = array(null, null);
$strNext = $strPrev = '';
@@ -54,7 +63,10 @@
$this->next = array(null, null);
}
if ($parent !== 'index' && $parent !== 'ROOT') {
- $this->up = array($parent.".html", PhDHelper::getDescription($parent,
false));
+ $this->up = array(
+ $parent.".html",
+ htmlspecialchars(PhDHelper::getDescription($parent, false))
+ );
}
}
@@ -71,12 +83,12 @@
';
}
if ($this->prev[0]) {
- $strPrev = '<a href="' . $this->prev[0] .
'">Prev</a>';
+ $strPrev = '<a href="' . $this->prev[0] . '"
title="' . $this->prev[1] . '">Prev</a>';
$header .= ' <link rel="prev" href="' . $this->prev[0]
. '" title="' . $this->prev[1] . '" />
';
}
if ($this->next[0]) {
- $strNext = '<a href="' . $this->next[0] .
'">Next</a>';
+ $strNext = '<a href="' . $this->next[0] . '"
title="' . $this->next[1] . '">Next</a>';
$header .= ' <link rel="next" href="' . $this->next[0]
. '" title="' . $this->next[1] . '" />
';
}